Skip to content

Commit a3cdb33

Browse files
committed
Fix Rodio version
1 parent f760174 commit a3cdb33

File tree

5 files changed

+38
-15
lines changed

5 files changed

+38
-15
lines changed

Cargo.lock

+32-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/onetagger-autotag/src/shazam.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use anyhow::Error;
22
use std::path::Path;
33
use std::thread::Builder;
4-
use rodio::source::UniformSourceIterator;
4+
use onetagger_player::rodio::source::UniformSourceIterator;
55
use serde::{Serialize, Deserialize};
66
use songrec::SignatureGenerator;
77
use onetagger_player::AudioSources;

crates/onetagger-player/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ anyhow = "1.0"
1414
pacmog = "0.4.2"
1515
mp4parse = "0.17"
1616

17-
rodio = { version = "0.19", features = ["symphonia-aac", "symphonia-isomp4", "symphonia-mp3"] }
17+
rodio = { version = "0.19", features = ["symphonia-aac", "symphonia-isomp4", "flac", "vorbis", "wav", "minimp3"], default-features = false }
1818

crates/onetagger-player/src/aiff.rs

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ impl AIFFDecoder {
6565
let specs = reader.get_pcm_specs();
6666

6767
// Decode the file (because the library is weeeird)
68+
// TODO: Make better using symphonia / new rodio
6869
let mut samples = vec![0i16; specs.num_channels as usize * specs.num_samples as usize];
6970
let mut i = 0;
7071
for sample in 0..specs.num_samples {

crates/onetagger-player/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ pub mod alac;
1717
pub mod flac;
1818
pub mod aiff;
1919

20+
/// Re-Export to prevent dependency issues
21+
pub use rodio;
22+
2023
pub struct AudioPlayer {
2124
tx: Sender<PlayerAction>,
2225
rx: Receiver<bool>,

0 commit comments

Comments
 (0)