unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-07 12:16:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip: refactor pt.42 (104e) wat

Browse source
This commit is contained in:
🪞👃🪞 2024-11-15 21:11:39 +01:00
parent 79895fe3f6
commit bf0e14c252
5 changed files with 133 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

0
crates/tek_api/src/api_color.rs Normal file
View file

0
crates/tek_api/src/api_name.rs Normal file
View file

127
crates/tek_tui/src/tui_arranger.rs
View file

@ -10,10 +10,7 @@ impl TryFrom<&Arc<RwLock<JackClient>>> for ArrangerApp<Tui> {
tracks: vec![], tracks: vec![],
metronome: false, metronome: false,
transport: jack.read().unwrap().transport(), transport: jack.read().unwrap().transport(),
clock: Arc::new(Clock::from(Instant::default())),
jack: jack.clone(), jack: jack.clone(),
sequencer: SequencerView::from(&model.sequencer),
split: 20,
selected: ArrangerSelection::Clip(0, 0), selected: ArrangerSelection::Clip(0, 0),
mode: ArrangerMode::Vertical(2), mode: ArrangerMode::Vertical(2),
color: Color::Rgb(28, 35, 25).into(), color: Color::Rgb(28, 35, 25).into(),
@ -82,10 +79,10 @@ impl InputToCommand<Tui, ArrangerApp<Tui>> for ArrangerAppCommand {
}, },
_ => Self::App(match view.focused() { _ => Self::App(match view.focused() {
Content(ArrangerViewFocus::Transport) => Transport( Content(ArrangerViewFocus::Transport) => Transport(
TransportCommand::input_to_command(&view.app.sequencer.transport, input)? TransportCommand::input_to_command(&view.app.transport, input)?
), ),
Content(ArrangerViewFocus::PhraseEditor) => Editor( Content(ArrangerViewFocus::PhraseEditor) => Editor(
PhraseEditorCommand::input_to_command(&view.app.sequencer.editor, input)? PhraseEditorCommand::input_to_command(&view.app.editor, input)?
), ),
Content(ArrangerViewFocus::PhrasePool) => match input.event() { Content(ArrangerViewFocus::PhrasePool) => match input.event() {
key!(KeyCode::Char('e')) => EditPhrase( key!(KeyCode::Char('e')) => EditPhrase(
@ -107,28 +104,28 @@ impl InputToCommand<Tui, ArrangerApp<Tui>> for ArrangerAppCommand {
_ => match input.event() { _ => match input.event() {
// FIXME: boundary conditions // FIXME: boundary conditions
key!(KeyCode::Up) => match view.selected { key!(KeyCode::Up) => match view.app.selected {
Select::Mix => return None, Select::Mix => return None,
Select::Track(t) => return None, Select::Track(t) => return None,
Select::Scene(s) => Select(Select::Scene(s - 1)), Select::Scene(s) => Select(Select::Scene(s - 1)),
Select::Clip(t, s) => Select(Select::Clip(t, s - 1)), Select::Clip(t, s) => Select(Select::Clip(t, s - 1)),
}, },
key!(KeyCode::Down) => match view.selected { key!(KeyCode::Down) => match view.app.selected {
Select::Mix => Select(Select::Scene(0)), Select::Mix => Select(Select::Scene(0)),
Select::Track(t) => Select(Select::Clip(t, 0)), Select::Track(t) => Select(Select::Clip(t, 0)),
Select::Scene(s) => Select(Select::Scene(s + 1)), Select::Scene(s) => Select(Select::Scene(s + 1)),
Select::Clip(t, s) => Select(Select::Clip(t, s + 1)), Select::Clip(t, s) => Select(Select::Clip(t, s + 1)),
}, },
key!(KeyCode::Left) => match view.selected { key!(KeyCode::Left) => match view.app.selected {
Select::Mix => return None, Select::Mix => return None,
Select::Track(t) => Select(Select::Track(t - 1)), Select::Track(t) => Select(Select::Track(t - 1)),
Select::Scene(s) => return None, Select::Scene(s) => return None,
Select::Clip(t, s) => Select(Select::Clip(t - 1, s)), Select::Clip(t, s) => Select(Select::Clip(t - 1, s)),
}, },
key!(KeyCode::Right) => match view.selected { key!(KeyCode::Right) => match view.app.selected {
Select::Mix => return None, Select::Mix => return None,
Select::Track(t) => Select(Select::Track(t + 1)), Select::Track(t) => Select(Select::Track(t + 1)),
Select::Scene(s) => Select(Select::Clip(0, s)), Select::Scene(s) => Select(Select::Clip(0, s)),
@ -145,42 +142,42 @@ impl InputToCommand<Tui, ArrangerApp<Tui>> for ArrangerAppCommand {
key!(KeyCode::Char('`')) => { todo!("toggle view mode") }, key!(KeyCode::Char('`')) => { todo!("toggle view mode") },
key!(KeyCode::Char(',')) => match view.selected { key!(KeyCode::Char(',')) => match view.app.selected {
Select::Mix => Zoom(0), Select::Mix => Zoom(0),
Select::Track(t) => Track(Track::Swap(t, t - 1)), Select::Track(t) => Track(Track::Swap(t, t - 1)),
Select::Scene(s) => Scene(Scene::Swap(s, s - 1)), Select::Scene(s) => Scene(Scene::Swap(s, s - 1)),
Select::Clip(t, s) => Clip(Clip::Set(t, s, None)), Select::Clip(t, s) => Clip(Clip::Set(t, s, None)),
}, },
key!(KeyCode::Char('.')) => match view.selected { key!(KeyCode::Char('.')) => match view.app.selected {
Select::Mix => Zoom(0), Select::Mix => Zoom(0),
Select::Track(t) => Track(Track::Swap(t, t + 1)), Select::Track(t) => Track(Track::Swap(t, t + 1)),
Select::Scene(s) => Scene(Scene::Swap(s, s + 1)), Select::Scene(s) => Scene(Scene::Swap(s, s + 1)),
Select::Clip(t, s) => Clip(Clip::Set(t, s, None)), Select::Clip(t, s) => Clip(Clip::Set(t, s, None)),
}, },
key!(KeyCode::Char('<')) => match view.selected { key!(KeyCode::Char('<')) => match view.app.selected {
Select::Mix => Zoom(0), Select::Mix => Zoom(0),
Select::Track(t) => Track(Track::Swap(t, t - 1)), Select::Track(t) => Track(Track::Swap(t, t - 1)),
Select::Scene(s) => Scene(Scene::Swap(s, s - 1)), Select::Scene(s) => Scene(Scene::Swap(s, s - 1)),
Select::Clip(t, s) => Clip(Clip::Set(t, s, None)), Select::Clip(t, s) => Clip(Clip::Set(t, s, None)),
}, },
key!(KeyCode::Char('>')) => match view.selected { key!(KeyCode::Char('>')) => match view.app.selected {
Select::Mix => Zoom(0), Select::Mix => Zoom(0),
Select::Track(t) => Track(Track::Swap(t, t + 1)), Select::Track(t) => Track(Track::Swap(t, t + 1)),
Select::Scene(s) => Scene(Scene::Swap(s, s + 1)), Select::Scene(s) => Scene(Scene::Swap(s, s + 1)),
Select::Clip(t, s) => Clip(Clip::Set(t, s, None)), Select::Clip(t, s) => Clip(Clip::Set(t, s, None)),
}, },
key!(KeyCode::Enter) => match view.selected { key!(KeyCode::Enter) => match view.app.selected {
Select::Mix => return None, Select::Mix => return None,
Select::Track(t) => return None, Select::Track(t) => return None,
Select::Scene(s) => Scene(Scene::Play(s)), Select::Scene(s) => Scene(Scene::Play(s)),
Select::Clip(t, s) => return None, Select::Clip(t, s) => return None,
}, },
key!(KeyCode::Delete) => match view.selected { key!(KeyCode::Delete) => match view.app.selected {
Select::Mix => Clear, Select::Mix => Clear,
Select::Track(t) => Track(Track::Delete(t)), Select::Track(t) => Track(Track::Delete(t)),
Select::Scene(s) => Scene(Scene::Delete(s)), Select::Scene(s) => Scene(Scene::Delete(s)),
@ -189,12 +186,12 @@ impl InputToCommand<Tui, ArrangerApp<Tui>> for ArrangerAppCommand {
key!(KeyCode::Char('c')) => Clip(Clip::RandomColor), key!(KeyCode::Char('c')) => Clip(Clip::RandomColor),
key!(KeyCode::Char('s')) => match view.selected { key!(KeyCode::Char('s')) => match view.app.selected {
Select::Clip(t, s) => Clip(Clip::Set(t, s, None)), Select::Clip(t, s) => Clip(Clip::Set(t, s, None)),
_ => return None, _ => return None,
}, },
key!(KeyCode::Char('g')) => match view.selected { key!(KeyCode::Char('g')) => match view.app.selected {
Select::Clip(t, s) => Clip(Clip::Get(t, s)), Select::Clip(t, s) => Clip(Clip::Get(t, s)),
_ => return None, _ => return None,
}, },
@ -242,7 +239,7 @@ impl Command<ArrangerApp<Tui>> for ArrangerViewCommand {
Zoom(zoom) => { todo!(); }, Zoom(zoom) => { todo!(); },
Select(selected) => { state.selected = selected; Ok(None) }, Select(selected) => { state.selected = selected; Ok(None) },
EditPhrase(phrase) => { EditPhrase(phrase) => {
state.sequencer.editor.phrase = phrase.clone(); state.editor.phrase = phrase.clone();
state.focus(ArrangerViewFocus::PhraseEditor); state.focus(ArrangerViewFocus::PhraseEditor);
state.focus_enter(); state.focus_enter();
Ok(None) Ok(None)
@ -266,7 +263,6 @@ pub struct ArrangerView<E: Engine> {
tracks: Vec<ArrangerTrack>, tracks: Vec<ArrangerTrack>,
scenes: Vec<ArrangerScene>, scenes: Vec<ArrangerScene>,
name: Arc<RwLock<String>>, name: Arc<RwLock<String>>,
sequencer: SequencerView<E>,
splits: [u16;2], splits: [u16;2],
selected: ArrangerSelection, selected: ArrangerSelection,
mode: ArrangerMode, mode: ArrangerMode,
@ -423,7 +419,7 @@ impl Content for ArrangerView<Tui> {
fn content (&self) -> impl Widget<Engine = Tui> { fn content (&self) -> impl Widget<Engine = Tui> {
Split::up( Split::up(
1, 1,
widget(&self.sequencer.transport), widget(&self.transport),
Split::down( Split::down(
self.split, self.split,
lay!( lay!(
@ -450,9 +446,9 @@ impl Content for ArrangerView<Tui> {
.push_x(1), .push_x(1),
), ),
Split::right( Split::right(
self.sequencer.split, self.split,
widget(&self.sequencer.phrases), widget(&self.phrases),
widget(&self.sequencer.editor), widget(&self.editor),
) )
) )
) )
@ -464,12 +460,12 @@ impl<E: Engine> ArrangerView<E> {
/// Focus the editor with the current phrase /// Focus the editor with the current phrase
pub fn show_phrase (&mut self) { pub fn show_phrase (&mut self) {
self.sequencer.editor.show(self.selected_phrase().as_ref()); self.editor.show(self.selected_phrase().as_ref());
} }
pub fn activate (&mut self) { pub fn activate (&mut self) {
let scenes = self.model.scenes(); let scenes = self.scenes();
let tracks = self.model.tracks_mut(); let tracks = self.tracks_mut();
match self.selected { match self.selected {
ArrangerSelection::Scene(s) => { ArrangerSelection::Scene(s) => {
for (t, track) in tracks.iter_mut().enumerate() { for (t, track) in tracks.iter_mut().enumerate() {
@ -499,9 +495,9 @@ impl<E: Engine> ArrangerView<E> {
pub fn is_last_row (&self) -> bool { pub fn is_last_row (&self) -> bool {
let selected = self.selected; let selected = self.selected;
(self.model.scenes().len() == 0 && (selected.is_mix() || selected.is_track())) || match selected { (self.scenes().len() == 0 && (selected.is_mix() || selected.is_track())) || match selected {
ArrangerSelection::Scene(s) => s == self.model.scenes().len() - 1, ArrangerSelection::Scene(s) => s == self.scenes().len() - 1,
ArrangerSelection::Clip(_, s) => s == self.model.scenes().len() - 1, ArrangerSelection::Clip(_, s) => s == self.scenes().len() - 1,
_ => false _ => false
} }
} }
@ -518,23 +514,23 @@ impl<E: Engine> ArrangerView<E> {
self.color = ItemColor::random_dark() self.color = ItemColor::random_dark()
}, },
ArrangerSelection::Track(t) => { ArrangerSelection::Track(t) => {
self.model.tracks_mut()[t].color = ItemColor::random() self.tracks_mut()[t].color = ItemColor::random()
}, },
ArrangerSelection::Scene(s) => { ArrangerSelection::Scene(s) => {
self.model.scenes_mut()[s].color = ItemColor::random() self.scenes_mut()[s].color = ItemColor::random()
}, },
ArrangerSelection::Clip(t, s) => { ArrangerSelection::Clip(t, s) => {
if let Some(phrase) = &self.model.scenes_mut()[s].clips[t] { if let Some(phrase) = &self.scenes_mut()[s].clips[t] {
phrase.write().unwrap().color = ItemColorTriplet::random(); phrase.write().unwrap().color = ItemColorTriplet::random();
} }
} }
} }
} }
pub fn selected_scene (&self) -> Option<&ArrangerScene> { pub fn selected_scene (&self) -> Option<&ArrangerScene> {
self.selected.scene().map(|s|self.model.scenes().get(s)).flatten() self.selected.scene().map(|s|self.scenes().get(s)).flatten()
} }
pub fn selected_scene_mut (&mut self) -> Option<&mut ArrangerScene> { pub fn selected_scene_mut (&mut self) -> Option<&mut ArrangerScene> {
self.selected.scene().map(|s|self.model.scenes_mut().get_mut(s)).flatten() self.selected.scene().map(|s|self.scenes_mut().get_mut(s)).flatten()
} }
pub fn selected_phrase (&self) -> Option<Arc<RwLock<Phrase>>> { pub fn selected_phrase (&self) -> Option<Arc<RwLock<Phrase>>> {
self.selected_scene()?.clips.get(self.selected.track()?)?.clone() self.selected_scene()?.clips.get(self.selected.track()?)?.clone()
@ -543,28 +539,28 @@ impl<E: Engine> ArrangerView<E> {
impl<E: Engine> Audio for ArrangerView<E> { impl<E: Engine> Audio for ArrangerView<E> {
#[inline] fn process (&mut self, client: &Client, scope: &ProcessScope) -> Control { #[inline] fn process (&mut self, client: &Client, scope: &ProcessScope) -> Control {
if self.model.process(client, scope) == Control::Quit { if self.process(client, scope) == Control::Quit {
return Control::Quit return Control::Quit
} }
// FIXME: one of these per playing track // FIXME: one of these per playing track
if let ArrangerSelection::Clip(t, s) = self.selected { if let ArrangerSelection::Clip(t, s) = self.selected {
let phrase = self.model.scenes().get(s).map(|scene|scene.clips.get(t)); let phrase = self.scenes().get(s).map(|scene|scene.clips.get(t));
if let Some(Some(Some(phrase))) = phrase { if let Some(Some(Some(phrase))) = phrase {
if let Some(track) = self.model.tracks().get(t) { if let Some(track) = self.tracks().get(t) {
if let Some((ref started_at, Some(ref playing))) = track.player.phrase { if let Some((ref started_at, Some(ref playing))) = track.player.phrase {
let phrase = phrase.read().unwrap(); let phrase = phrase.read().unwrap();
if *playing.read().unwrap() == *phrase { if *playing.read().unwrap() == *phrase {
let pulse = self.sequencer.transport.model.clock().current.pulse.get(); let pulse = self.current().pulse.get();
let start = started_at.pulse.get(); let start = started_at.pulse.get();
let now = (pulse - start) % phrase.length as f64; let now = (pulse - start) % phrase.length as f64;
self.sequencer.editor.now.set(now); self.editor.now.set(now);
return Control::Continue return Control::Continue
} }
} }
} }
} }
} }
self.sequencer.editor.now.set(0.); self.editor.now.set(0.);
return Control::Continue return Control::Continue
} }
} }
@ -610,12 +606,12 @@ impl<E: Engine> Audio for ArrangerView<E> {
///// Focus the editor with the current phrase ///// Focus the editor with the current phrase
//pub fn edit_phrase (&mut self) { //pub fn edit_phrase (&mut self) {
//if self.arrangement.selected.is_clip() && self.arrangement.phrase().is_none() { //if self.arrangement.selected.is_clip() && self.arrangement.phrase().is_none() {
//self.sequencer.phrases.append_new(None, Some(self.next_color().into())); //self.phrases.append_new(None, Some(self.next_color().into()));
//self.arrangement.phrase_put(); //self.arrangement.phrase_put();
//} //}
//self.show_phrase(); //self.show_phrase();
//self.focus(ArrangerViewFocus::PhraseEditor); //self.focus(ArrangerViewFocus::PhraseEditor);
//self.sequencer.editor.entered = true; //self.editor.entered = true;
//} //}
//pub fn next_color (&self) -> ItemColor { //pub fn next_color (&self) -> ItemColor {
@ -666,15 +662,15 @@ impl FocusGrid for ArrangerApp<Tui> {
let focused = self.focused(); let focused = self.focused();
if !self.entered { if !self.entered {
self.entered = focused == Content(Arranger); self.entered = focused == Content(Arranger);
self.app.sequencer.editor.entered = focused == Content(PhraseEditor); self.app.editor.entered = focused == Content(PhraseEditor);
self.app.sequencer.phrases.entered = focused == Content(PhrasePool); self.app.phrases.entered = focused == Content(PhrasePool);
} }
} }
fn focus_exit (&mut self) { fn focus_exit (&mut self) {
if self.entered { if self.entered {
self.entered = false; self.entered = false;
self.app.sequencer.editor.entered = false; self.app.editor.entered = false;
self.app.sequencer.phrases.entered = false; self.app.phrases.entered = false;
} }
} }
fn entered (&self) -> Option<Self::Item> { fn entered (&self) -> Option<Self::Item> {
@ -699,14 +695,14 @@ impl FocusGrid for ArrangerApp<Tui> {
use ArrangerViewFocus::*; use ArrangerViewFocus::*;
let focused = self.focused(); let focused = self.focused();
self.app.focused = focused == Content(Arranger); self.app.focused = focused == Content(Arranger);
self.app.sequencer.transport.focused = focused == Content(Transport); self.app.transport.focused = focused == Content(Transport);
self.app.sequencer.phrases.focused = focused == Content(PhrasePool); self.app.phrases.focused = focused == Content(PhrasePool);
self.app.sequencer.editor.focused = focused == Content(PhraseEditor); self.app.editor.focused = focused == Content(PhraseEditor);
if let Some(mut status_bar) = self.status_bar { if let Some(mut status_bar) = self.status_bar {
status_bar.update(&( status_bar.update(&(
self.focused(), self.focused(),
self.app.selected, self.app.selected,
self.app.sequencer.editor.entered self.app.editor.entered
)) ))
} }
} }
@ -990,9 +986,9 @@ pub fn arranger_content_vertical (
view: &ArrangerView<Tui>, view: &ArrangerView<Tui>,
factor: usize factor: usize
) -> impl Widget<Engine = Tui> + use<'_> { ) -> impl Widget<Engine = Tui> + use<'_> {
let clock = view.model.clock(); let clock = view.clock();
let tracks = view.model.tracks(); let tracks = view.tracks();
let scenes = view.model.scenes(); let scenes = view.scenes();
let cols = track_widths(tracks); let cols = track_widths(tracks);
let rows = ArrangerScene::ppqs(scenes, factor); let rows = ArrangerScene::ppqs(scenes, factor);
let bg = view.color; let bg = view.color;
@ -1030,14 +1026,13 @@ pub fn arranger_content_vertical (
let header = row!((track, w) in tracks.iter().zip(cols.iter().map(|col|col.0))=>{ let header = row!((track, w) in tracks.iter().zip(cols.iter().map(|col|col.0))=>{
// name and width of track // name and width of track
let name = track.name.read().unwrap(); let name = track.name.read().unwrap();
let player = &track.player;
let max_w = w.saturating_sub(1).min(name.len()).max(2); let max_w = w.saturating_sub(1).min(name.len()).max(2);
let name = format!("▎{}", &name[0..max_w]); let name = format!("▎{}", &name[0..max_w]);
let name = TuiStyle::bold(name, true); let name = TuiStyle::bold(name, true);
// beats elapsed // beats elapsed
let elapsed = if let Some((_, Some(phrase))) = player.phrase.as_ref() { let elapsed = if let Some((_, Some(phrase))) = track.phrase().as_ref() {
let length = phrase.read().unwrap().length; let length = phrase.read().unwrap().length;
let elapsed = player.pulses_since_start().unwrap(); let elapsed = track.pulses_since_start().unwrap();
let elapsed = clock.timebase().format_beats_1_short( let elapsed = clock.timebase().format_beats_1_short(
(elapsed as usize % length) as f64 (elapsed as usize % length) as f64
); );
@ -1046,7 +1041,7 @@ pub fn arranger_content_vertical (
String::from("▎") String::from("▎")
}; };
// beats until switchover // beats until switchover
let until_next = player.next_phrase.as_ref().map(|(t, _)|{ let until_next = track.next_phrase().as_ref().map(|(t, _)|{
let target = t.pulse.get(); let target = t.pulse.get();
let current = clock.current.pulse.get(); let current = clock.current.pulse.get();
if target > current { if target > current {
@ -1057,12 +1052,12 @@ pub fn arranger_content_vertical (
} }
}).unwrap_or(String::from("▎")); }).unwrap_or(String::from("▎"));
// name of active MIDI input // name of active MIDI input
let input = format!("▎>{}", track.player.midi_inputs.get(0) let input = format!("▎>{}", track.midi_inputs().get(0)
.map(|port|port.short_name()) .map(|port|port.short_name())
.transpose()? .transpose()?
.unwrap_or("(none)".into())); .unwrap_or("(none)".into()));
// name of active MIDI output // name of active MIDI output
let output = format!("▎<{}", track.player.midi_outputs.get(0) let output = format!("▎<{}", track.midi_outputs().get(0)
.map(|port|port.short_name()) .map(|port|port.short_name())
.transpose()? .transpose()?
.unwrap_or("(none)".into())); .unwrap_or("(none)".into()));
@ -1095,7 +1090,7 @@ pub fn arranger_content_vertical (
let color = phrase.read().unwrap().color; let color = phrase.read().unwrap().color;
add(&name.as_str()[0..max_w].push_x(1).fixed_x(w as u16))?; add(&name.as_str()[0..max_w].push_x(1).fixed_x(w as u16))?;
bg = color.dark.rgb; bg = color.dark.rgb;
if let Some((_, Some(ref playing))) = track.player.phrase { if let Some((_, Some(ref playing))) = track.phrase() {
if *playing.read().unwrap() == *phrase.read().unwrap() { if *playing.read().unwrap() == *phrase.read().unwrap() {
bg = color.light.rgb bg = color.light.rgb
} }
@ -1177,7 +1172,7 @@ pub fn arranger_content_horizontal (
view: &ArrangerView<Tui>, view: &ArrangerView<Tui>,
) -> impl Widget<Engine = Tui> + use<'_> { ) -> impl Widget<Engine = Tui> + use<'_> {
let focused = view.focused; let focused = view.focused;
let _tracks = view.model.tracks(); let _tracks = view.tracks();
lay!( lay!(
focused.then_some(Background(TuiTheme::border_bg())), focused.then_some(Background(TuiTheme::border_bg())),
row!( row!(
@ -1333,7 +1328,7 @@ pub fn arranger_content_horizontal (
CustomWidget::new(|_|{todo!()}, |to: &mut TuiOutput|{ CustomWidget::new(|_|{todo!()}, |to: &mut TuiOutput|{
let [x, y, _, height] = to.area(); let [x, y, _, height] = to.area();
let mut x2 = 0; let mut x2 = 0;
Ok(for (scene_index, scene) in view.model.scenes().iter().enumerate() { Ok(for (scene_index, scene) in view.scenes().iter().enumerate() {
let active_scene = view.selected.scene() == Some(scene_index); let active_scene = view.selected.scene() == Some(scene_index);
let sep = Some(if active_scene { let sep = Some(if active_scene {
Style::default().yellow().not_dim() Style::default().yellow().not_dim()
@ -1376,7 +1371,7 @@ pub struct ArrangerScene {
pub color: ItemColor, pub color: ItemColor,
} }
impl ArrangerSceneApi for ArrangerTrack { impl ArrangerSceneApi for ArrangerScene {
fn name (&self) -> &Arc<RwLock<String>> { fn name (&self) -> &Arc<RwLock<String>> {
&self.name &self.name
} }
@ -1453,5 +1448,11 @@ impl MidiInputApi for ArrangerTrack {
impl MidiOutputApi for ArrangerTrack { impl MidiOutputApi for ArrangerTrack {
} }
impl ClockApi for ArrangerTrack {
}
impl PlayheadApi for ArrangerTrack {
}
impl PlayerApi for ArrangerTrack { impl PlayerApi for ArrangerTrack {
} }

91
crates/tek_tui/src/tui_sequencer.rs
View file

@ -4,15 +4,17 @@ impl TryFrom<&Arc<RwLock<JackClient>>> for SequencerApp<Tui> {
type Error = Box<dyn std::error::Error>; type Error = Box<dyn std::error::Error>;
fn try_from (jack: &Arc<RwLock<JackClient>>) -> Usually<Self> { fn try_from (jack: &Arc<RwLock<JackClient>>) -> Usually<Self> {
let clock = Arc::new(Clock::from(Instant::default())); let clock = Arc::new(Clock::from(Instant::default()));
Ok(Self::new(SequencerModel { Ok(Self::new(SequencerView {
phrases: vec![], phrases: vec![],
player: MIDIPlayer::new(jack, &clock, "preview")?,
transport: TransportModel {
metronome: false, metronome: false,
transport: jack.read().unwrap().transport(), transport: jack.read().unwrap().transport(),
jack: jack.clone(), jack: jack.clone(),
clock: clock.clone() clock: Arc::new(Clock::from(Instant::default())),
}, focused: false,
focus: TransportViewFocus::PlayPause,
size: Measure::new(),
phrases: PhrasePoolView::from(&model.phrases()),
editor: PhraseEditor::new(),
}.into(), None, None)) }.into(), None, None))
} }
} }
@ -69,6 +71,26 @@ impl InputToCommand<Tui, SequencerApp<Tui>> for SequencerAppCommand {
} }
} }
impl Command<SequencerApp<Tui>> for SequencerAppCommand {
fn execute (self, state: &mut SequencerApp<Tui>) -> Perhaps<Self> {
use AppViewCommand::*;
match self {
Focus(cmd) => delegate(cmd, Focus, state),
App(cmd) => delegate(cmd, App, state),
}
}
}
impl Command<SequencerApp<Tui>> for SequencerViewCommand {
fn execute (self, state: &mut SequencerApp<Tui>) -> Perhaps<Self> {
use SequencerViewCommand::*;
match self {
Phrases(cmd) => delegate(cmd, Phrases, &mut state.phrases),
Editor(cmd) => delegate(cmd, Editor, &mut state.editor),
Transport(cmd) => delegate(cmd, Transport, &mut state.transport)
}
}
}
/// Root view for standalone `tek_sequencer`. /// Root view for standalone `tek_sequencer`.
pub struct SequencerView<E: Engine> { pub struct SequencerView<E: Engine> {
@ -129,18 +151,6 @@ pub enum SequencerStatusBar {
PhraseEditor, PhraseEditor,
} }
impl<E: Engine> From<SequencerModel> for SequencerView<E> {
fn from (model: SequencerModel) -> Self {
Self {
split: 20,
transport: TransportView::from(&model.transport()),
phrases: PhrasePoolView::from(&model.phrases()),
editor: PhraseEditor::new(),
model,
}
}
}
impl Content for SequencerView<Tui> { impl Content for SequencerView<Tui> {
type Engine = Tui; type Engine = Tui;
fn content (&self) -> impl Widget<Engine = Tui> { fn content (&self) -> impl Widget<Engine = Tui> {
@ -178,27 +188,6 @@ impl Content for SequencerStatusBar {
} }
} }
impl Command<SequencerApp<Tui>> for SequencerAppCommand {
fn execute (self, state: &mut SequencerApp<Tui>) -> Perhaps<Self> {
use AppViewCommand::*;
match self {
Focus(cmd) => delegate(cmd, Focus, state),
App(cmd) => delegate(cmd, App, state),
}
}
}
impl Command<SequencerApp<Tui>> for SequencerViewCommand {
fn execute (self, state: &mut SequencerApp<Tui>) -> Perhaps<Self> {
use SequencerViewCommand::*;
match self {
Phrases(cmd) => delegate(cmd, Phrases, &mut state.phrases),
Editor(cmd) => delegate(cmd, Editor, &mut state.editor),
Transport(cmd) => delegate(cmd, Transport, &mut state.transport)
}
}
}
impl FocusGrid for SequencerApp<Tui> { impl FocusGrid for SequencerApp<Tui> {
type Item = AppViewFocus<SequencerFocus>; type Item = AppViewFocus<SequencerFocus>;
fn cursor (&self) -> (usize, usize) { fn cursor (&self) -> (usize, usize) {
@ -241,13 +230,13 @@ impl FocusGrid for SequencerApp<Tui> {
} }
} }
impl HasJack for SequencerView { impl<E: Engine> HasJack for SequencerView<E> {
fn jack (&self) -> &Arc<RwLock<JackClient>> { fn jack (&self) -> &Arc<RwLock<JackClient>> {
self.transport.jack() self.transport.jack()
} }
} }
impl HasPhrases for SequencerView { impl<E: Engine> HasPhrases for SequencerView<E> {
fn phrases (&self) -> &Vec<Arc<RwLock<Phrase>>> { fn phrases (&self) -> &Vec<Arc<RwLock<Phrase>>> {
&self.phrases &self.phrases
} }
@ -256,11 +245,23 @@ impl HasPhrases for SequencerView {
} }
} }
impl HasPlayer for SequencerView { impl<E: Engine> HasMidiBuffer for SequencerView<E> {
fn player (&self) -> &MIDIPlayer {
&self.player
} }
fn player_mut (&mut self) -> &mut MIDIPlayer {
&mut self.player impl<E: Engine> HasPhrase for SequencerView<E> {
} }
impl<E: Engine> MidiInputApi for SequencerView<E> {
}
impl<E: Engine> MidiOutputApi for SequencerView<E> {
}
impl<E: Engine> ClockApi for SequencerView<E> {
}
impl<E: Engine> PlayheadApi for SequencerView<E> {
}
impl<E: Engine> PlayerApi for SequencerView<E> {
} }

43
crates/tek_tui/src/tui_transport.rs
View file

@ -119,19 +119,18 @@ impl Command<TransportApp<Tui>> for TransportAppCommand {
impl Command<TransportApp<Tui>> for TransportCommand { impl Command<TransportApp<Tui>> for TransportCommand {
fn execute (self, state: &mut TransportApp<Tui>) -> Perhaps<Self> { fn execute (self, state: &mut TransportApp<Tui>) -> Perhaps<Self> {
use TransportCommand::{Clock, Playhead};
use ClockCommand::{SetBpm, SetQuant, SetSync}; use ClockCommand::{SetBpm, SetQuant, SetSync};
let clock = state.app.clock();
Ok(Some(match self { Ok(Some(match self {
SetBpm(bpm) => SetBpm(clock.timebase().bpm.set(bpm)), Clock(SetBpm(bpm)) => Clock(SetBpm(state.timebase().bpm.set(bpm))),
SetQuant(quant) => SetQuant(clock.quant.set(quant)), Clock(SetQuant(quant)) => Clock(SetQuant(state.quant().set(quant))),
SetSync(sync) => SetSync(clock.sync.set(sync)), Clock(SetSync(sync)) => Clock(SetSync(state.sync().set(sync))),
_ => return Ok(None) _ => return Ok(None)
})) }))
} }
} }
/// Stores and displays time-related info. /// Stores and displays time-related info.
#[derive(Debug)]
pub struct TransportView<E: Engine> { pub struct TransportView<E: Engine> {
_engine: PhantomData<E>, _engine: PhantomData<E>,
jack: Arc<RwLock<JackClient>>, jack: Arc<RwLock<JackClient>>,
@ -154,21 +153,6 @@ pub struct TransportView<E: Engine> {
size: Measure<E>, size: Measure<E>,
} }
impl<E: Engine> ClockApi for TransportView<E> {
fn current (&self) -> &Instant {
&self.current
}
fn quant (&self) -> &Quantize {
&self.quant
}
fn sync (&self) -> &LaunchSync {
&self.sync
}
}
impl<E: Engine> PlayheadApi for TransportView<E> {
}
/// Which item of the transport toolbar is focused /// Which item of the transport toolbar is focused
#[derive(Clone, Copy, Debug, PartialEq)] #[derive(Clone, Copy, Debug, PartialEq)]
pub enum TransportViewFocus { pub enum TransportViewFocus {
@ -319,19 +303,28 @@ impl FocusGrid for TransportApp<Tui> {
} }
} }
impl HasJack for TransportView { impl<E: Engine> HasJack for TransportView<E> {
fn jack (&self) -> &Arc<RwLock<JackClient>> { fn jack (&self) -> &Arc<RwLock<JackClient>> {
&self.jack &self.jack
} }
} }
impl HasClock for TransportView { impl<E: Engine> ClockApi for TransportView<E> {
fn clock (&self) -> &Arc<Clock> { fn current (&self) -> &Instant {
&self.clock &self.current
}
fn quant (&self) -> &Quantize {
&self.quant
}
fn sync (&self) -> &LaunchSync {
&self.sync
} }
} }
impl std::fmt::Debug for TransportView { impl<E: Engine> PlayheadApi for TransportView<E> {
}
impl<E: Engine> std::fmt::Debug for TransportView<E> {
fn fmt (&self, f: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), Error> { fn fmt (&self, f: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), Error> {
f.debug_struct("transport") f.debug_struct("transport")
.field("jack", &self.jack) .field("jack", &self.jack)