Mirrors/rodio
2
0
Fork 0
mirror of https://github.com/RustAudio/rodio synced 2024-11-10 14:14:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Extract DynamicMixer::sum_current_sources()

Browse source 
I think this makes the next() function easier to understand. We can
write this more efficiently by reusing a Vec on the struct rather than
allocating each time and a mem::swap to avoid shifting elements in a Vec.
This commit is contained in:
Chris Patuzzo 2021-07-22 20:33:36 +01:00 committed by est31
parent 437bcf4ce7
commit d40551db78
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/dynamic_mixer.rs
View file

@ -32,6 +32,7 @@ where
input: input.clone(),
sample_count: 0,
still_pending: vec![],
still_current: vec![],
};
(input, output)
@ -77,6 +78,9 @@ pub struct DynamicMixer<S> {
// A temporary vec used in start_pending_sources.
still_pending: Vec<Box<dyn Source<Item = S> + Send>>,
// A temporary vec used in sum_current_sources.
still_current: Vec<Box<dyn Source<Item = S> + Send>>,
}
impl<S> Source for DynamicMixer<S>
@ -118,24 +122,7 @@ where
self.sample_count += 1;
if self.current_sources.is_empty() {
return None;
}
let mut to_drop = Vec::new();
let mut sum = S::zero_value();
for (num, src) in self.current_sources.iter_mut().enumerate() {
if let Some(val) = src.next() {
sum = sum.saturating_add(val);
} else {
to_drop.push(num);
}
}
for &td in to_drop.iter().rev() {
self.current_sources.remove(td);
}
let sum = self.sum_current_sources();
if self.current_sources.is_empty() {
None
@ -175,6 +162,20 @@ where
let has_pending = !pending.is_empty();
self.input.has_pending.store(has_pending, Ordering::SeqCst); // TODO: relax ordering?
}
fn sum_current_sources(&mut self) -> S {
let mut sum = S::zero_value();
for mut source in self.current_sources.drain(..) {
if let Some(value) = source.next() {
sum = sum.saturating_add(value);
self.still_current.push(source);
}
}
std::mem::swap(&mut self.still_current, &mut self.current_sources);
sum
}
}
#[cfg(test)]