Remove with-vorbis and with-tremor features (#750)

This commit is contained in:
Roderick van Domburg 2021-05-26 21:43:20 +02:00 committed by GitHub
parent bb3dd64c87
commit 11dfedea3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 93 deletions

View file

@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed ### Removed
- [connect] Removed no-op mixer started/stopped logic (breaking) - [connect] Removed no-op mixer started/stopped logic (breaking)
- [playback] Removed `with-vorbis` and `with-tremor` features
- [playback] `alsamixer`: removed `--mixer-linear-volume` option; use `--volume-ctrl linear` instead - [playback] `alsamixer`: removed `--mixer-linear-volume` option; use `--volume-ctrl linear` instead
### Fixed ### Fixed

69
Cargo.lock generated
View file

@ -529,12 +529,6 @@ dependencies = [
"slab", "slab",
] ]
[[package]]
name = "gcc"
version = "0.3.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
[[package]] [[package]]
name = "generic-array" name = "generic-array"
version = "0.14.4" version = "0.14.4"
@ -1286,7 +1280,6 @@ version = "0.2.0"
dependencies = [ dependencies = [
"alsa", "alsa",
"byteorder", "byteorder",
"cfg-if 1.0.0",
"cpal", "cpal",
"futures-executor", "futures-executor",
"futures-util", "futures-util",
@ -1300,7 +1293,6 @@ dependencies = [
"librespot-audio", "librespot-audio",
"librespot-core", "librespot-core",
"librespot-metadata", "librespot-metadata",
"librespot-tremor",
"log", "log",
"ogg", "ogg",
"portaudio-rs", "portaudio-rs",
@ -1311,7 +1303,6 @@ dependencies = [
"shell-words", "shell-words",
"thiserror", "thiserror",
"tokio", "tokio",
"vorbis",
"zerocopy", "zerocopy",
] ]
@ -1324,18 +1315,6 @@ dependencies = [
"protobuf-codegen-pure", "protobuf-codegen-pure",
] ]
[[package]]
name = "librespot-tremor"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97f525bff915d478a76940a7b988e5ea34911ba7280c97bd3a7673f54d68b4fe"
dependencies = [
"cc",
"libc",
"ogg-sys",
"pkg-config",
]
[[package]] [[package]]
name = "lock_api" name = "lock_api"
version = "0.4.4" version = "0.4.4"
@ -1618,17 +1597,6 @@ dependencies = [
"byteorder", "byteorder",
] ]
[[package]]
name = "ogg-sys"
version = "0.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a95b8c172e17df1a41bf8d666301d3b2c4efeb90d9d0415e2a4dc0668b35fdb2"
dependencies = [
"gcc",
"libc",
"pkg-config",
]
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.7.2" version = "1.7.2"
@ -2492,43 +2460,6 @@ version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
[[package]]
name = "vorbis"
version = "0.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e8a194457075360557b82dac78f7ca2d65bbb6679bccfabae5f7c8c706cc776"
dependencies = [
"libc",
"ogg-sys",
"vorbis-sys",
"vorbisfile-sys",
]
[[package]]
name = "vorbis-sys"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd9ed6ef5361a85e68ccc005961d995c2d44e31f0816f142025f2ca2383dfbfd"
dependencies = [
"cc",
"libc",
"ogg-sys",
"pkg-config",
]
[[package]]
name = "vorbisfile-sys"
version = "0.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f4306d7e1ac4699b55e20de9483750b90c250913188efd7484db6bfbe9042d1"
dependencies = [
"gcc",
"libc",
"ogg-sys",
"pkg-config",
"vorbis-sys",
]
[[package]] [[package]]
name = "walkdir" name = "walkdir"
version = "2.3.2" version = "2.3.2"

View file

@ -73,9 +73,6 @@ rodiojack-backend = ["librespot-playback/rodiojack-backend"]
sdl-backend = ["librespot-playback/sdl-backend"] sdl-backend = ["librespot-playback/sdl-backend"]
gstreamer-backend = ["librespot-playback/gstreamer-backend"] gstreamer-backend = ["librespot-playback/gstreamer-backend"]
with-tremor = ["librespot-playback/with-tremor"]
with-vorbis = ["librespot-playback/with-vorbis"]
with-dns-sd = ["librespot-discovery/with-dns-sd"] with-dns-sd = ["librespot-discovery/with-dns-sd"]
default = ["rodio-backend"] default = ["rodio-backend"]

View file

@ -18,15 +18,15 @@ path = "../metadata"
version = "0.2.0" version = "0.2.0"
[dependencies] [dependencies]
cfg-if = "1.0"
futures-executor = "0.3" futures-executor = "0.3"
futures-util = { version = "0.3", default_features = false, features = ["alloc"] } futures-util = { version = "0.3", default_features = false, features = ["alloc"] }
log = "0.4" log = "0.4"
byteorder = "1.4" byteorder = "1.4"
shell-words = "1.0.0" shell-words = "1.0.0"
tokio = { version = "1", features = ["sync"] } tokio = { version = "1", features = ["sync"] }
zerocopy = { version = "0.3" } zerocopy = { version = "0.3" }
# Backends
alsa = { version = "0.5", optional = true } alsa = { version = "0.5", optional = true }
portaudio-rs = { version = "0.3", optional = true } portaudio-rs = { version = "0.3", optional = true }
libpulse-binding = { version = "2", optional = true, default-features = false } libpulse-binding = { version = "2", optional = true, default-features = false }
@ -42,11 +42,9 @@ rodio = { version = "0.14", optional = true, default-features = false
cpal = { version = "0.13", optional = true } cpal = { version = "0.13", optional = true }
thiserror = { version = "1", optional = true } thiserror = { version = "1", optional = true }
# Decoders # Decoder
lewton = "0.10" # Currently not optional because of limitations of cargo features lewton = "0.10"
librespot-tremor = { version = "0.2", optional = true }
ogg = "0.8" ogg = "0.8"
vorbis = { version ="0.0", optional = true }
# Dithering # Dithering
rand = "0.8" rand = "0.8"
@ -61,6 +59,3 @@ rodio-backend = ["rodio", "cpal", "thiserror"]
rodiojack-backend = ["rodio", "cpal/jack", "thiserror"] rodiojack-backend = ["rodio", "cpal/jack", "thiserror"]
sdl-backend = ["sdl2"] sdl-backend = ["sdl2"]
gstreamer-backend = ["gstreamer", "gstreamer-app", "glib"] gstreamer-backend = ["gstreamer", "gstreamer-app", "glib"]
with-tremor = ["librespot-tremor"]
with-vorbis = ["vorbis"]

View file

@ -1,16 +1,7 @@
use std::fmt; use std::fmt;
use cfg_if::cfg_if; mod lewton_decoder;
pub use lewton_decoder::{VorbisDecoder, VorbisError};
cfg_if! {
if #[cfg(any(feature = "with-tremor", feature = "with-vorbis"))] {
mod libvorbis_decoder;
pub use libvorbis_decoder::{VorbisDecoder, VorbisError};
} else {
mod lewton_decoder;
pub use lewton_decoder::{VorbisDecoder, VorbisError};
}
}
mod passthrough_decoder; mod passthrough_decoder;
pub use passthrough_decoder::{PassthroughDecoder, PassthroughError}; pub use passthrough_decoder::{PassthroughDecoder, PassthroughError};