lewton_decoder becomes default, libvorbis_decoder optional

.travis.yml

@@ -24,7 +24,7 @@ before_script:
 script:
     - cargo build --no-default-features
     - cargo build --no-default-features --features "with-tremor"
-    - cargo build --no-default-features --features "with-lewton";
+    - cargo build --no-default-features --features "with-vorbis"
     - cargo build --no-default-features --features "portaudio-backend"
     - cargo build --no-default-features --features "pulseaudio-backend"
     - cargo build --no-default-features --features "alsa-backend"

Cargo.toml

@@ -69,7 +69,7 @@ pulseaudio-backend = ["libpulse-sys", "libc"]
 jackaudio-backend = ["jack"]
 
 with-tremor = ["librespot-audio/with-tremor"]
-with-lewton = ["librespot-audio/with-lewton"]
+with-vorbis = ["librespot-audio/with-vorbis"]
 
 with-dns-sd = ["dns-sd"]
 

audio/Cargo.toml

@@ -10,16 +10,16 @@ path = "../core"
 bit-set = "0.4.0"
 byteorder = "1.0"
 futures = "0.1.8"
+lewton = "0.8.0"
 log = "0.3.5"
 num-bigint = "0.1.35"
 num-traits = "0.1.36"
 rust-crypto = { git = "https://github.com/awmath/rust-crypto.git", branch = "avx2" }
 tempfile = "2.1"
-vorbis = "0.1.0"
 
 tremor = { git = "https://github.com/plietar/rust-tremor", optional = true }
-lewton = { version = "0.8.0", optional = true }
+vorbis = { version ="0.1.0", optional = true }
 
 [features]
 with-tremor = ["tremor"]
-with-lewton = ["lewton"]
+with-vorbis = ["vorbis"]

audio/src/lib.rs

@@ -13,15 +13,15 @@ extern crate librespot_core as core;
 mod fetch;
 mod decrypt;
 
-#[cfg(not(feature = "with-lewton"))]
-mod libvorbis_decoder;
-#[cfg(feature = "with-lewton")]
+#[cfg(not(any(feature = "with-tremor", feature = "with-vorbis")))]
 mod lewton_decoder;
+#[cfg(any(feature = "with-tremor", feature = "with-vorbis"))]
+mod libvorbis_decoder;
 
 pub use fetch::{AudioFile, AudioFileOpen};
 pub use decrypt::AudioDecrypt;
 
-#[cfg(not(feature = "with-lewton"))]
-pub use libvorbis_decoder::{VorbisDecoder, VorbisPacket, VorbisError};
-#[cfg(feature = "with-lewton")]
+#[cfg(not(any(feature = "with-tremor", feature = "with-vorbis")))]
 pub use lewton_decoder::{VorbisDecoder, VorbisPacket, VorbisError};
+#[cfg(any(feature = "with-tremor", feature = "with-vorbis"))]
+pub use libvorbis_decoder::{VorbisDecoder, VorbisPacket, VorbisError};