wip: refactor pt.6, fixed tek_api

crates/tek_tui/src/tui_sampler.rs

@@ -37,6 +37,20 @@ impl<E: Engine> SamplerView<E> {
                 modal:    Default::default()
             }))
     }
+    /// Immutable reference to sample at cursor.
+    pub fn sample (&self) -> Option<&Arc<RwLock<Sample>>> {
+        for (i, sample) in self.mapped.values().enumerate() {
+            if i == self.cursor.0 {
+                return Some(sample)
+            }
+        }
+        for (i, sample) in self.unmapped.iter().enumerate() {
+            if i + self.mapped.len() == self.cursor.0 {
+                return Some(sample)
+            }
+        }
+        None
+    }
 }
 
 /// A sound sample.
@@ -49,7 +63,6 @@ pub struct Sample {
     pub rate:     Option<usize>,
 }
 
-
 /// Load sample from WAV and assign to MIDI note.
 #[macro_export] macro_rules! sample {
     ($note:expr, $name:expr, $src:expr) => {{
@@ -303,35 +316,7 @@ impl Sample {
     }
 }
 
-/// A currently playing instance of a sample.
-pub struct Voice {
-    pub sample:   Arc<RwLock<Sample>>,
-    pub after:    usize,
-    pub position: usize,
-    pub velocity: f32,
-}
-
-impl Iterator for Voice {
-    type Item = [f32;2];
-    fn next (&mut self) -> Option<Self::Item> {
-        if self.after > 0 {
-            self.after = self.after - 1;
-            return Some([0.0, 0.0])
-        }
-        let sample = self.sample.read().unwrap();
-        if self.position < sample.end {
-            let position = self.position;
-            self.position = self.position + 1;
-            return sample.channels[0].get(position).map(|_amplitude|[
-                sample.channels[0][position] * self.velocity,
-                sample.channels[0][position] * self.velocity,
-            ])
-        }
-        None
-    }
-}
-
-impl Widget for Sampler<Tui> {
+impl Widget for SamplerView<Tui> {
     type Engine = Tui;
     fn layout (&self, to: [u16;2]) -> Perhaps<[u16;2]> {
         todo!()
@@ -341,7 +326,7 @@ impl Widget for Sampler<Tui> {
     }
 }
 
-pub fn tui_render_sampler (sampler: &Sampler<Tui>, to: &mut TuiOutput) -> Usually<()> {
+pub fn tui_render_sampler (sampler: &SamplerView<Tui>, to: &mut TuiOutput) -> Usually<()> {
     let [x, y, _, height] = to.area();
     let style = Style::default().gray();
     let title = format!(" {} ({})", sampler.name, sampler.voices.read().unwrap().len());