bump nix and alsa

haileys · Jun 28, 2024 · 4353c52 · 4353c52
1 parent ced8036
commit 4353c52
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bark/Cargo.toml b/bark/Cargo.toml
@@ -11,14 +11,14 @@ opus = ["bark-core/opus"]
 bark-core = { workspace = true }
 bark-protocol = { workspace = true }
 
-alsa = "0.8.1"
+alsa = "0.9"
 bitflags = { workspace = true }
 bytemuck = { workspace = true, features = ["extern_crate_alloc"] }
 derive_more = { workspace = true }
 env_logger = { version = "0.10", default-features = false, features = ["color", "auto-color", "humantime"] }
-libc = "0.2.147"
+libc = "0.2.155"
 log = { workspace = true }
-nix = { version = "0.26.2", features = ["time", "socket", "net", "poll", "user", "hostname"], default-features = false }
+nix = { version = "0.29", features = ["time", "socket", "net", "poll", "user", "hostname"], default-features = false }
 rand = "0.8.5"
 serde = { version = "1.0.183", features = ["derive"] }
 serde_json = "1.0.105"

diff --git a/bark/src/audio/alsa/input.rs b/bark/src/audio/alsa/input.rs
@@ -2,7 +2,6 @@ use alsa::Direction;
 use alsa::pcm::PCM;
 use bark_core::audio::{Frame, self};
 use bark_protocol::time::{Timestamp, SampleDuration};
-use nix::errno::Errno;
 
 use crate::audio::config::DeviceOpt;
 use crate::audio::alsa::config::{self, OpenError};
@@ -46,13 +45,13 @@ impl Input {
 
  // handle recoverable errors
  match err.errno() {
- | Errno::EPIPE // underrun
- | Errno::ESTRPIPE // stream suspended
- | Errno::EINTR // interrupted syscall
+ | libc::EPIPE // underrun
+ | libc::ESTRPIPE // stream suspended
+ | libc::EINTR // interrupted syscall
  => {
  log::warn!("recovering from error: {}", err.errno());
  // try to recover
- self.pcm.recover(err.errno() as i32, false)?;
+ self.pcm.recover(err.errno(), false)?;
  }
  _ => { return Err(err.into()); }
  }

diff --git a/bark/src/audio/alsa/output.rs b/bark/src/audio/alsa/output.rs
@@ -2,7 +2,6 @@ use alsa::Direction;
 use alsa::pcm::PCM;
 use bark_core::audio::{Frame, self};
 use bark_protocol::time::SampleDuration;
-use nix::errno::Errno;
 
 use crate::audio::config::DeviceOpt;
 use crate::audio::alsa::config::{self, OpenError};
@@ -42,13 +41,13 @@ impl Output {
 
  // handle recoverable errors
  match err.errno() {
- | Errno::EPIPE // underrun
- | Errno::ESTRPIPE // stream suspended
- | Errno::EINTR // interrupted syscall
+ | libc::EPIPE // underrun
+ | libc::ESTRPIPE // stream suspended
+ | libc::EINTR // interrupted syscall
  => {
  log::warn!("recovering from error: {}", err.errno());
  // try to recover
- self.pcm.recover(err.errno() as i32, false)?;
+ self.pcm.recover(err.errno(), false)?;
  }
  _ => { return Err(err.into()); }
  }

diff --git a/bark/src/socket.rs b/bark/src/socket.rs
@@ -1,9 +1,9 @@
 use std::io;
 use std::net::{Ipv4Addr, UdpSocket, SocketAddr, SocketAddrV4};
-use std::os::fd::AsRawFd;
+use std::os::fd::AsFd;
 
 use derive_more::Display;
-use nix::poll::{PollFd, PollFlags};
+use nix::poll::{PollFd, PollFlags, PollTimeout};
 use socket2::{Domain, Type};
 use structopt::StructOpt;
 
@@ -77,11 +77,11 @@ impl Socket {
 
  pub fn recv_from(&self, buf: &mut [u8]) -> Result<(usize, PeerId), io::Error> {
  let mut poll = [
- PollFd::new(self.tx.as_raw_fd(), PollFlags::POLLIN),
- PollFd::new(self.rx.as_raw_fd(), PollFlags::POLLIN),
+ PollFd::new(self.tx.as_fd(), PollFlags::POLLIN),
+ PollFd::new(self.rx.as_fd(), PollFlags::POLLIN),
  ];
 
- nix::poll::poll(&mut poll, -1)?;
+ nix::poll::poll(&mut poll, PollTimeout::NONE)?;
 
  let (nbytes, addr) =
  if poll[0].any() == Some(true) {