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

fix transport focus order

Browse source
This commit is contained in:
🪞👃🪞 2024-11-25 18:35:57 +01:00
parent 3569019b86
commit 571d475657
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/tek_tui/src/tui_app_arranger.rs
View file

@ -48,8 +48,10 @@ impl TryFrom<&Arc<RwLock<JackClient>>> for ArrangerTui {
status_bar: None, status_bar: None,
midi_buf: vec![vec![];65536], midi_buf: vec![vec![];65536],
note_buf: vec![], note_buf: vec![],
focus: FocusState::Entered(AppFocus::Content(ArrangerFocus::Transport(TransportFocus::Bpm))),
perf: PerfModel::default(), perf: PerfModel::default(),
focus: FocusState::Entered(
AppFocus::Content(ArrangerFocus::Transport(TransportFocus::PlayPause))
),
}) })
} }
} }
@ -79,8 +81,8 @@ impl_focus!(ArrangerTui ArrangerFocus [
Content(Transport(TransportFocus::PlayPause)), Content(Transport(TransportFocus::PlayPause)),
Content(Transport(TransportFocus::Bpm)), Content(Transport(TransportFocus::Bpm)),
Content(Transport(TransportFocus::Sync)), Content(Transport(TransportFocus::Sync)),
Content(Transport(TransportFocus::Quant)),
Content(Transport(TransportFocus::Clock)), Content(Transport(TransportFocus::Clock)),
Content(Transport(TransportFocus::Quant))
], &[ ], &[
Content(Arranger), Content(Arranger),
Content(Arranger), Content(Arranger),

6
crates/tek_tui/src/tui_app_sequencer.rs
View file

@ -33,8 +33,10 @@ impl TryFrom<&Arc<RwLock<JackClient>>> for SequencerTui {
midi_buf: vec![vec![];65536], midi_buf: vec![vec![];65536],
note_buf: vec![], note_buf: vec![],
clock, clock,
focus: FocusState::Entered(AppFocus::Content(SequencerFocus::Transport(TransportFocus::Bpm))),
perf: PerfModel::default(), perf: PerfModel::default(),
focus: FocusState::Entered(
AppFocus::Content(SequencerFocus::Transport(TransportFocus::PlayPause))
),
}) })
} }
} }
@ -62,8 +64,8 @@ impl_focus!(SequencerTui SequencerFocus [
Content(Transport(TransportFocus::PlayPause)), Content(Transport(TransportFocus::PlayPause)),
Content(Transport(TransportFocus::Bpm)), Content(Transport(TransportFocus::Bpm)),
Content(Transport(TransportFocus::Sync)), Content(Transport(TransportFocus::Sync)),
Content(Transport(TransportFocus::Quant)),
Content(Transport(TransportFocus::Clock)), Content(Transport(TransportFocus::Clock)),
Content(Transport(TransportFocus::Quant))
], ],
&[ &[
Content(Phrases), Content(Phrases),

6
crates/tek_tui/src/tui_app_transport.rs
View file

@ -18,7 +18,9 @@ impl TryFrom<&Arc<RwLock<JackClient>>> for TransportTui {
clock: ClockModel::from(&Arc::new(jack.read().unwrap().transport())), clock: ClockModel::from(&Arc::new(jack.read().unwrap().transport())),
size: Measure::new(), size: Measure::new(),
cursor: (0, 0), cursor: (0, 0),
focus: FocusState::Entered(AppFocus::Content(TransportFocus::Bpm)) focus: FocusState::Entered(
AppFocus::Content(TransportFocus::PlayPause)
)
}) })
} }
} }
@ -60,9 +62,9 @@ impl_focus!(TransportTui TransportFocus [
&[ &[
Content(PlayPause), Content(PlayPause),
Content(Bpm), Content(Bpm),
Content(Quant),
Content(Sync), Content(Sync),
Content(Clock), Content(Clock),
Content(Quant)
], ],
]); ]);

6
crates/tek_tui/src/tui_view_transport.rs
View file

@ -41,12 +41,12 @@ impl Content for TransportView {
format!("{}.{:03}", *bpm as usize, (bpm * 1000.0) % 1000.0) format!("{}.{:03}", *bpm as usize, (bpm * 1000.0) % 1000.0)
} }
})), })),
selected.wrap(TransportFocus::Quant, &Outset::X(1u16, row! {
"QUANT ", pulses_to_name(*quant as usize)
})),
selected.wrap(TransportFocus::Sync, &Outset::X(1u16, row! { selected.wrap(TransportFocus::Sync, &Outset::X(1u16, row! {
"SYNC ", pulses_to_name(*sync as usize) "SYNC ", pulses_to_name(*sync as usize)
})), })),
selected.wrap(TransportFocus::Quant, &Outset::X(1u16, row! {
"QUANT ", pulses_to_name(*quant as usize)
})),
selected.wrap(TransportFocus::Clock, &{ selected.wrap(TransportFocus::Clock, &{
row!("B" , beat.as_str(), " T", msu.as_str()).outset_x(1) row!("B" , beat.as_str(), " T", msu.as_str()).outset_x(1)
}).align_e().fill_x(), }).align_e().fill_x(),