diff --git a/src/main.rs b/src/main.rs index 231ce7c..61d5c50 100644 --- a/src/main.rs +++ b/src/main.rs @@ -28,8 +28,8 @@ fn play(mut s: seq::SynSeq, sample_rate: usize, bpm: usize) { sample_rate: sample_rate, channel_sample_count: samples_per_beat, }; - let beats = s.beats(); - let duration = 1 + 60 * beats / bpm; + let beats = s.beats() + 3; + let duration = 60 * beats / bpm; let sample_count = (params.channel_sample_count) as usize; let mut left: Vec = vec![0_f32; sample_count]; diff --git a/src/seq.rs b/src/seq.rs index 3910bad..0639a41 100644 --- a/src/seq.rs +++ b/src/seq.rs @@ -44,8 +44,8 @@ impl SynSeq { pub fn beats(&self) -> usize { let mut longest = 0 as usize; for (_, seq) in self.seqs.iter() { - longest = if seq.beats.len() > longest { - seq.beats.len() + longest = if seq.len() > longest { + seq.len() } else { longest }; @@ -56,7 +56,7 @@ impl SynSeq { #[derive(PartialEq)] pub struct Seq { - beats: Vec<(i32, tone::Tone)>, + beats: Vec<(usize, tone::Tone)>, state: Option, } @@ -72,6 +72,14 @@ impl Seq { } } + fn len(&self) -> usize { + let mut sum = 0 as usize; + for beat in self.beats.iter() { + sum += beat.0 as usize; + } + sum + } + fn pop(&mut self) -> (Option, bool) { let state_before = self.state.clone(); let tone_after = self._pop(); @@ -109,7 +117,7 @@ impl Seq { let n = match captures.name("count") { Some(number) if number.as_str().len() > 0 => number.as_str().parse::().unwrap(), _ => 1, - } as i32; + } as usize; let tone = tone::new(captures.name("tone").unwrap().as_str()); self.beats.push((n, tone)); @@ -123,14 +131,18 @@ mod test { #[test] fn test_seq() { let mut seq = new(); + seq.append("c"); seq.append("4d"); seq.append("g 2e"); + assert_eq!(seq.beats.len(), 4); - assert_eq!(seq.beats[0], (1 as i32, tone::new("c"))); - assert_eq!(seq.beats[1], (4 as i32, tone::new("d"))); - assert_eq!(seq.beats[2], (1 as i32, tone::new("g"))); - assert_eq!(seq.beats[3], (2 as i32, tone::new("e"))); + assert_eq!(seq.len(), 8); + + assert_eq!(seq.beats[0], (1 as usize, tone::new("c"))); + assert_eq!(seq.beats[1], (4 as usize, tone::new("d"))); + assert_eq!(seq.beats[2], (1 as usize, tone::new("g"))); + assert_eq!(seq.beats[3], (2 as usize, tone::new("e"))); assert_eq!(seq.pop(), (Some(tone::new("c")), true)); assert_eq!(seq.pop(), (Some(tone::new("d")), true));