From 66825cfceb599a854d41a9f05ed165213e17ead3 Mon Sep 17 00:00:00 2001 From: Tom Barrett Date: Wed, 11 Mar 2020 08:04:30 -0500 Subject: reverses waveform and appends iterator directly --- src/audio.rs | 16 ++++++++-------- src/tom.rs | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/audio.rs b/src/audio.rs index ef92408..961c8ed 100644 --- a/src/audio.rs +++ b/src/audio.rs @@ -31,14 +31,14 @@ pub fn init() -> (StreamingSource, Vec) { _track_length += samples.len() as f32 / sample_channels; - samples = samples - .into_iter() - .enumerate() - .filter(|(i, _)| i % 2 == 0) - .map(|(_, s)| s) - .collect(); - - waveform.append(&mut samples); + waveform.append( + &mut samples + .into_iter() + .enumerate() + .filter(|(i, _)| i % 2 == 0) + .map(|(_, s)| s) + .collect(), + ); } (stream, waveform) diff --git a/src/tom.rs b/src/tom.rs index 8a55f44..d8c8c24 100644 --- a/src/tom.rs +++ b/src/tom.rs @@ -141,6 +141,8 @@ impl Tom { }); } + self.wave.reverse(); + self.last_x += constants::SAMPLE_RATE / 60; } } -- cgit v1.2.3