diff --git a/Cargo.lock b/Cargo.lock index 307253bf..90d4cfa1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -48,19 +48,7 @@ dependencies = [ "alsa-sys", "bitflags", "libc", - "nix 0.20.0", -] - -[[package]] -name = "alsa" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" -dependencies = [ - "alsa-sys", - "bitflags", - "libc", - "nix 0.23.1", + "nix", ] [[package]] @@ -324,7 +312,7 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98f45f0a21f617cd2c788889ef710b63f075c949259593ea09c826f1e47a2418" dependencies = [ - "alsa 0.5.0", + "alsa", "core-foundation-sys", "coreaudio-rs", "jack 0.7.3", @@ -335,7 +323,7 @@ dependencies = [ "mach", "ndk 0.3.0", "ndk-glue 0.3.0", - "nix 0.20.0", + "nix", "oboe", "parking_lot", "stdweb", @@ -1466,7 +1454,7 @@ dependencies = [ name = "librespot-playback" version = "0.3.1" dependencies = [ - "alsa 0.6.0", + "alsa", "byteorder", "cpal", "futures-util", @@ -1560,15 +1548,6 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - [[package]] name = "mime" version = "0.3.16" @@ -1706,19 +1685,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" -dependencies = [ - "bitflags", - "cc", - "cfg-if", - "libc", - "memoffset", -] - [[package]] name = "nom" version = "5.1.2" diff --git a/playback/Cargo.toml b/playback/Cargo.toml index bd495175..707d28f9 100644 --- a/playback/Cargo.toml +++ b/playback/Cargo.toml @@ -28,7 +28,7 @@ tokio = { version = "1", features = ["parking_lot", "rt", "rt-multi-thread", "sy zerocopy = "0.6" # Backends -alsa = { version = "0.6", optional = true } +alsa = { version = "0.5", optional = true } portaudio-rs = { version = "0.3", optional = true } libpulse-binding = { version = "2", optional = true, default-features = false } libpulse-simple-binding = { version = "2", optional = true, default-features = false } diff --git a/playback/src/audio_backend/alsa.rs b/playback/src/audio_backend/alsa.rs index 20e73618..16aa420d 100644 --- a/playback/src/audio_backend/alsa.rs +++ b/playback/src/audio_backend/alsa.rs @@ -90,8 +90,11 @@ impl From for Format { F32 => Format::float(), S32 => Format::s32(), S24 => Format::s24(), - S24_3 => Format::s24_3(), S16 => Format::s16(), + #[cfg(target_endian = "little")] + S24_3 => Format::S243LE, + #[cfg(target_endian = "big")] + S24_3 => Format::S243BE, } } }