Mirrors/rodio
2
0
Fork 0
mirror of https://github.com/RustAudio/rodio synced 2024-12-13 13:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

switch to fork for cpal

Browse source
This commit is contained in:
dskleingeld 2021-01-27 00:12:23 +01:00 committed by dvdsk
parent 023e833b01
commit 204a3f89c9
No known key found for this signature in database
GPG key ID: 6CF9D20C5709A836
3 changed files with 56 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -15,7 +15,7 @@ claxon = { version = "0.4.2", optional = true }
hound = { version = "3.3.1", optional = true }
lewton = { version = "0.10", optional = true }
# minimp3_fixed = { version = "0.5.4", optional = true}
minimp3 = { git = "https://github.com/dskleingeld/minimp3-rs.git", optional = true }
minimp3_fixed = { package = "minimp3", git = "https://github.com/dvdsk/minimp3-rs.git", optional = true }
symphonia = { version = "0.5.2", optional = true, default-features = false }
crossbeam-channel = { version = "0.5.8", optional = true }

41
src/decoder/mod.rs
View file

@ -373,15 +373,17 @@ where
R: Read + Seek,
{
fn request_pos(&mut self, pos: f32) -> bool {
match self.0 {
#[cfg(feature = "wav")]
DecoderImpl::Wav(ref source) => false,
#[cfg(feature = "vorbis")]
DecoderImpl::Vorbis(ref source) => false,
#[cfg(feature = "flac")]
DecoderImpl::Flac(ref source) => false,
#[cfg(feature = "mp3")]
DecoderImpl::Mp3(ref mut source) => source.request_pos(pos),
match &mut self.0 {
#[cfg(all(feature = "wav", not(feature = "symphonia-wav")))]
DecoderImpl::Wav(_) => false,
#[cfg(all(feature = "vorbis", not(feature = "symphonia-vorbis")))]
DecoderImpl::Vorbis(_) => false,
#[cfg(all(feature = "flac", not(feature = "symphonia-flac")))]
DecoderImpl::Flac(_) => false,
#[cfg(all(feature = "minimp3", not(feature = "symphonia-mp3")))]
DecoderImpl::Mp3(source) => source.request_pos(pos),
#[cfg(feature = "symphonia")]
DecoderImpl::Symphonia(_) => false,
DecoderImpl::None(_) => false,
}
}
@ -392,18 +394,19 @@ where
R: Read + Seek,
{
fn request_pos(&mut self, pos: f32) -> bool {
match self.0 {
#[cfg(feature = "wav")]
DecoderImpl::Wav(ref source) => false,
#[cfg(feature = "vorbis")]
DecoderImpl::Vorbis(ref source) => false,
#[cfg(feature = "flac")]
DecoderImpl::Flac(ref source) => false,
#[cfg(feature = "mp3")]
DecoderImpl::Mp3(ref mut source) => {source.request_pos(pos)},
match &mut self.0 {
#[cfg(all(feature = "wav", not(feature = "symphonia-wav")))]
DecoderImpl::Wav(_) => false,
#[cfg(all(feature = "vorbis", not(feature = "symphonia-vorbis")))]
DecoderImpl::Vorbis(_) => false,
#[cfg(all(feature = "flac", not(feature = "symphonia-flac")))]
DecoderImpl::Flac(_) => false,
#[cfg(all(feature = "minimp3", not(feature = "symphonia-mp3")))]
DecoderImpl::Mp3(source) => source.request_pos(pos),
#[cfg(feature = "symphonia")]
DecoderImpl::Symphonia(_) => false,
DecoderImpl::None(_) => false,
}
// todo!();
}
}

55
src/sink.rs
View file

@ -29,13 +29,9 @@ struct Controls {
pause: AtomicBool,
volume: Mutex<f32>,
stopped: AtomicBool,
<<<<<<< HEAD
speed: Mutex<f32>,
to_clear: Mutex<u32>,
||||||| parent of 2cb7526 (seek implemented through SourceExt trait)
=======
set_pos: Mutex<Option<f32>>,
>>>>>>> 2cb7526 (seek implemented through SourceExt trait)
}
impl Sink {
@ -59,13 +55,9 @@ impl Sink {
pause: AtomicBool::new(false),
volume: Mutex::new(1.0),
stopped: AtomicBool::new(false),
<<<<<<< HEAD
speed: Mutex::new(1.0),
to_clear: Mutex::new(0),
||||||| parent of 2cb7526 (seek implemented through SourceExt trait)
=======
set_pos: Mutex::new(None),
>>>>>>> 2cb7526 (seek implemented through SourceExt trait)
}),
sound_count: Arc::new(AtomicUsize::new(0)),
detached: false,
@ -129,32 +121,51 @@ impl Sink {
#[inline]
pub fn append_seekable<S>(&self, source: S)
where
S: Source + Send + 'static,
S: SourceExt + Send + 'static,
S::Item: Sample,
S::Item: Send,
S: Source + SourceExt + Send + 'static,
f32: FromSample<S::Item>,
S::Item: Sample + Send,
{
// Wait for queue to flush then resume stopped playback
if self.controls.stopped.load(Ordering::SeqCst) {
if self.sound_count.load(Ordering::SeqCst) > 0 {
self.sleep_until_end();
}
self.controls.stopped.store(false, Ordering::SeqCst);
}
let controls = self.controls.clone();
let start_played = AtomicBool::new(false);
let source = source
.speed(1.0)
.pausable(false)
.amplify(1.0)
.skippable()
.stoppable()
.periodic_access(Duration::from_millis(5), move |src| {
if controls.stopped.load(Ordering::SeqCst) {
src.stop();
} else {
src.inner_mut().set_factor(*controls.volume.lock().unwrap());
src.inner_mut()
.inner_mut()
.set_paused(controls.pause.load(Ordering::SeqCst));
if let Some(pos) = controls.set_pos.lock().unwrap().take() {
src.inner_mut()
.inner_mut()
.inner_mut()
.request_pos(pos);
}
{
let mut to_clear = controls.to_clear.lock().unwrap();
if *to_clear > 0 {
let _ = src.inner_mut().skip();
*to_clear -= 1;
}
}
let amp = src.inner_mut().inner_mut();
amp.set_factor(*controls.volume.lock().unwrap());
amp.inner_mut()
.set_paused(controls.pause.load(Ordering::SeqCst));
amp.inner_mut()
.inner_mut()
.set_factor(*controls.speed.lock().unwrap());
let seekable = amp.inner_mut().inner_mut().inner_mut();
if let Some(pos) = controls.set_pos.lock().unwrap().take() {
seekable.request_pos(pos);
}
start_played.store(true, Ordering::SeqCst);
})
.convert_samples();
self.sound_count.fetch_add(1, Ordering::Relaxed);