Remove with-vorbis and with-tremor features

CHANGELOG.md

@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 - [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
 
 ### Fixed

Cargo.toml

@@ -73,9 +73,6 @@ rodiojack-backend = ["librespot-playback/rodiojack-backend"]
 sdl-backend = ["librespot-playback/sdl-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"]
 
 default = ["rodio-backend"]

playback/Cargo.toml

@@ -18,15 +18,15 @@ path = "../metadata"
 version = "0.2.0"
 
 [dependencies]
-cfg-if = "1.0"
 futures-executor = "0.3"
 futures-util = { version = "0.3", default_features = false, features = ["alloc"] }
 log = "0.4"
 byteorder = "1.4"
 shell-words = "1.0.0"
 tokio = { version = "1", features = ["sync"] }
-zerocopy        = { version = "0.3" }
+zerocopy = { version = "0.3" }
 
+# Backends
 alsa            = { version = "0.5", optional = true }
 portaudio-rs    = { version = "0.3", optional = true }
 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 }
 thiserror       = { version = "1", optional = true }
 
-# Decoders
-lewton = "0.10"  # Currently not optional because of limitations of cargo features
-librespot-tremor = { version = "0.2", optional = true }
+# Decoder
+lewton = "0.10"
 ogg = "0.8"
-vorbis = { version ="0.0", optional = true }
 
 # Dithering
 rand = "0.8"
@@ -60,7 +58,4 @@ jackaudio-backend = ["jack"]
 rodio-backend = ["rodio", "cpal", "thiserror"]
 rodiojack-backend = ["rodio", "cpal/jack", "thiserror"]
 sdl-backend = ["sdl2"]
-gstreamer-backend = ["gstreamer", "gstreamer-app", "glib"]
-
-with-tremor = ["librespot-tremor"]
-with-vorbis = ["vorbis"]
+gstreamer-backend = ["gstreamer", "gstreamer-app", "glib"]

playback/src/decoder/mod.rs

@@ -1,16 +1,7 @@
 use std::fmt;
 
-use cfg_if::cfg_if;
-
-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 lewton_decoder;
+pub use lewton_decoder::{VorbisDecoder, VorbisError};
 
 mod passthrough_decoder;
 pub use passthrough_decoder::{PassthroughDecoder, PassthroughError};