diff --git a/crates/tek_core/src/space.rs b/crates/tek_core/src/space.rs index 734fedf2..cba04bc4 100644 --- a/crates/tek_core/src/space.rs +++ b/crates/tek_core/src/space.rs @@ -98,6 +98,10 @@ pub trait Area: Copy { [self.x(), self.y(), self.w(), a], [self.x(), self.y() + a, self.w(), self.h() - a], ), + Direction::Right => ( + [self.x(), self.y(), a, self.h()], + [self.x() + a, self.y(), self.w() - a, self.h()], + ), _ => todo!(), } } @@ -228,6 +232,16 @@ pub trait Layout: Widget + Sized { fn debug (self) -> DebugOverlay { DebugOverlay(self) } + fn split > ( + self, direction: Direction, amount: E::Unit, other: W + ) -> Split { + Split::new(direction, amount, self, other) + } + fn split_reverse > ( + self, direction: Direction, amount: E::Unit, other: W + ) -> Split { + Split::new(direction, amount, other, self) + } } impl> Layout for W {} @@ -324,6 +338,22 @@ impl Direction { pub fn is_right (&self) -> bool { match self { Self::Right => true, _ => false } } + pub fn cw (&self) -> Self { + match self { + Self::Up => Self::Right, + Self::Down => Self::Left, + Self::Left => Self::Up, + Self::Right => Self::Down, + } + } + pub fn ccw (&self) -> Self { + match self { + Self::Up => Self::Left, + Self::Down => Self::Right, + Self::Left => Self::Down, + Self::Right => Self::Up, + } + } } /// Override X and Y coordinates, aligning to corner, side, or center of area diff --git a/crates/tek_sequencer/src/arranger.rs b/crates/tek_sequencer/src/arranger.rs index c56b30a6..ba384fee 100644 --- a/crates/tek_sequencer/src/arranger.rs +++ b/crates/tek_sequencer/src/arranger.rs @@ -14,12 +14,18 @@ pub struct Arranger { pub sequencer_proxy: SequencerProxy, /// Slot for modal dialog displayed on top of app. pub modal: Option>>, + + + pub phrases: Arc>>, + pub editor: PhraseEditor, } /// Represents the tracks and scenes of the composition. pub struct Arrangement { /// Name of arranger pub name: Arc>, + /// Collection of phrases. + pub phrases: Arc>>, /// Collection of tracks. pub tracks: Vec>, /// Collection of scenes. @@ -33,11 +39,12 @@ pub struct Arrangement { } impl Arrangement { - pub fn new (name: &str) -> Self { + pub fn new (name: &str, phrases: &Arc>>) -> Self { Self { name: Arc::new(RwLock::new(name.into())), mode: ArrangerViewMode::Vertical(2), selected: ArrangerFocus::Clip(0, 0), + phrases: phrases.clone(), scenes: vec![], tracks: vec![], focused: false diff --git a/crates/tek_sequencer/src/arranger_cli.rs b/crates/tek_sequencer/src/arranger_cli.rs index ecd2da44..dc0b8c7d 100644 --- a/crates/tek_sequencer/src/arranger_cli.rs +++ b/crates/tek_sequencer/src/arranger_cli.rs @@ -26,9 +26,12 @@ impl ArrangerCli { let jack = JackClient::Inactive( Client::new("tek_arranger", ClientOptions::NO_START_SERVER)?.0 ); - let mut arrangement = Arrangement::new(""); let jack_transport = jack.transport(); let mut transport = TransportToolbar::new(Some(jack_transport)); + transport.set_focused(true); + let transport = Arc::new(RwLock::new(transport)); + let phrases = Arc::new(RwLock::new(PhrasePool::new())); + let mut arrangement = Arrangement::new("", &phrases); if let Some(name) = self.name.as_ref() { *arrangement.name.write().unwrap() = name.clone(); } @@ -46,8 +49,6 @@ impl ArrangerCli { //scene.clips[i] = Some(i); //} } - transport.set_focused(true); - let transport = Arc::new(RwLock::new(transport)); transport.write().unwrap().jack = Some( jack.activate( &transport.clone(), @@ -57,12 +58,14 @@ impl ArrangerCli { )? ); Tui::run(Arc::new(RwLock::new(Arranger { - transport: self.transport.then_some(transport), - show_sequencer: Some(tek_core::Direction::Down), - arrangement, - focus: 0, + transport: self.transport.then_some(transport), + show_sequencer: Some(tek_core::Direction::Down), + focus: 0, sequencer_proxy: SequencerProxy(Default::default(), false), - modal: None + modal: None, + editor: PhraseEditor::new(), + arrangement, + phrases, })))?; Ok(()) } diff --git a/crates/tek_sequencer/src/arranger_tui.rs b/crates/tek_sequencer/src/arranger_tui.rs index 315ab570..b194b4ea 100644 --- a/crates/tek_sequencer/src/arranger_tui.rs +++ b/crates/tek_sequencer/src/arranger_tui.rs @@ -7,13 +7,19 @@ impl Content for Arranger { Layers::new(move|add|{ add(&Stack::down(move|add|{ add(&self.transport)?; + let arrangement = &self.arrangement as &dyn Widget; if let (Some(direction), Some(sequencer)) = ( self.show_sequencer, self.arrangement.sequencer(), ) { - let arrangement = &self.arrangement as &dyn Widget; let sequencer = sequencer as &dyn Widget; - add(&Split::new(direction, 20, arrangement, sequencer.min_y(20))) + add(&arrangement.split( + direction, + 20, + self.phrases.clone() + .split(direction.ccw(), 20, sequencer) + .min_y(20) + )) } else { add(&self.arrangement) } @@ -722,3 +728,17 @@ impl Handle for ArrangerRenameModal { } } } + +impl Content for PhrasePool { + type Engine = Tui; + fn content (&self) -> impl Widget { + col!( + "Phrases:", + col!((i, phrase) in self.phrases.iter().enumerate() => format!("{i}")) + ) + .bg(Color::Rgb(28, 35, 25)) + .border(Lozenge(Style::default() + .bg(Color::Rgb(40, 50, 30)) + .fg(Color::Rgb(70, 80, 50)))) + } +}