Fix Rodio version

Marekkon5 · Aug 29, 2024 · a3cdb33 · a3cdb33
1 parent f760174
commit a3cdb33
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/onetagger-autotag/src/shazam.rs b/crates/onetagger-autotag/src/shazam.rs
@@ -1,7 +1,7 @@
 use anyhow::Error;
 use std::path::Path;
 use std::thread::Builder;
-use rodio::source::UniformSourceIterator;
+use onetagger_player::rodio::source::UniformSourceIterator;
 use serde::{Serialize, Deserialize};
 use songrec::SignatureGenerator;
 use onetagger_player::AudioSources;

diff --git a/crates/onetagger-player/Cargo.toml b/crates/onetagger-player/Cargo.toml
@@ -14,5 +14,5 @@ anyhow = "1.0"
 pacmog = "0.4.2"
 mp4parse = "0.17"
 
-rodio = { version = "0.19", features = ["symphonia-aac", "symphonia-isomp4", "symphonia-mp3"] }
+rodio = { version = "0.19", features = ["symphonia-aac", "symphonia-isomp4", "flac", "vorbis", "wav", "minimp3"], default-features = false }
 
diff --git a/crates/onetagger-player/src/aiff.rs b/crates/onetagger-player/src/aiff.rs
@@ -65,6 +65,7 @@ impl AIFFDecoder {
         let specs = reader.get_pcm_specs();
 
         // Decode the file (because the library is weeeird)
+        // TODO: Make better using symphonia / new rodio
         let mut samples = vec![0i16; specs.num_channels as usize * specs.num_samples as usize];
         let mut i = 0;
         for sample in 0..specs.num_samples {

diff --git a/crates/onetagger-player/src/lib.rs b/crates/onetagger-player/src/lib.rs
@@ -17,6 +17,9 @@ pub mod alac;
 pub mod flac;
 pub mod aiff;
 
+/// Re-Export to prevent dependency issues
+pub use rodio;
+
 pub struct AudioPlayer {
     tx: Sender<PlayerAction>,
     rx: Receiver<bool>,