From 7d6a43d87edbf211d067b035c6e99e07b8d8aa90 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Thu, 3 Oct 2024 22:03:43 +0300 Subject: [PATCH] update show_phrase --- crates/tek_sequencer/src/sequencer.rs | 14 +++++++++----- crates/tek_sequencer/src/sequencer_tui.rs | 8 ++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/crates/tek_sequencer/src/sequencer.rs b/crates/tek_sequencer/src/sequencer.rs index bc8fb20e..976b3b84 100644 --- a/crates/tek_sequencer/src/sequencer.rs +++ b/crates/tek_sequencer/src/sequencer.rs @@ -57,11 +57,15 @@ impl Arranger { .map(|track|self.tracks.get_mut(track)) .flatten() } - pub fn show_phrase (&mut self) -> Usually<()> { - //unimplemented!() - //let phrase = self.phrase(); - //self.sequencer.show(phrase) - Ok(()) + pub fn show_phrase (&mut self) { + let (scene, track) = (self.selected.scene(), self.selected.track()); + if let (Some(scene_index), Some(track_index)) = (scene, track) { + let scene = self.scenes.get(scene_index); + let track = self.tracks.get_mut(track_index); + if let (Some(scene), Some(track)) = (scene, track) { + track.viewing_phrase = scene.clips[track_index] + } + } } pub fn is_first_row (&self) -> bool { let selected = self.selected; diff --git a/crates/tek_sequencer/src/sequencer_tui.rs b/crates/tek_sequencer/src/sequencer_tui.rs index 241fe463..7675d5a8 100644 --- a/crates/tek_sequencer/src/sequencer_tui.rs +++ b/crates/tek_sequencer/src/sequencer_tui.rs @@ -64,7 +64,7 @@ impl Handle for Arranger { ArrangerViewMode::Horizontal => self.track_prev(), _ => self.scene_prev(), }; - self.show_phrase()?; + self.show_phrase(); }, // cursor_down key!(KeyCode::Down) => { @@ -72,7 +72,7 @@ impl Handle for Arranger { ArrangerViewMode::Horizontal => self.track_next(), _ => self.scene_next(), }; - self.show_phrase()?; + self.show_phrase(); }, // cursor left key!(KeyCode::Left) => { @@ -80,7 +80,7 @@ impl Handle for Arranger { ArrangerViewMode::Horizontal => self.scene_prev(), _ => self.track_prev(), }; - self.show_phrase()?; + self.show_phrase(); }, // cursor right key!(KeyCode::Right) => { @@ -88,7 +88,7 @@ impl Handle for Arranger { ArrangerViewMode::Horizontal => self.scene_next(), _ => self.track_next(), }; - self.show_phrase()?; + self.show_phrase(); }, // increment: use next clip here key!(KeyCode::Char('.')) => {