update clock model

This commit is contained in:
🪞👃🪞 2024-11-28 17:39:07 +01:00
parent 86649ef994
commit 54057afad8
5 changed files with 66 additions and 74 deletions

View file

@ -131,7 +131,7 @@ impl From<&SequencerTui> for SequencerStatusBar {
use SequencerFocus::*;
use TransportFocus::*;
let samples = state.clock.chunk.load(Ordering::Relaxed);
let rate = state.clock.current.timebase.sr.get() as f64;
let rate = state.clock.timebase.sr.get() as f64;
let buffer = samples as f64 / rate;
let default_help = &[("", "", " enter"), ("", "", " navigate")];
Self {

View file

@ -92,7 +92,7 @@ pub fn arranger_content_vertical (
factor: usize
) -> impl Widget<Engine = Tui> + use<'_> {
let timebase = view.clock().timebase();
let current = &view.clock().current;
let current = &view.clock().playhead;
let tracks = view.tracks();
let scenes = view.scenes();
let cols = track_widths(tracks);

View file

@ -60,12 +60,12 @@ impl<'a, T: HasClock> From<&'a T> for TransportView where Option<TransportFocus>
Self {
selected,
focused: selected.is_some(),
state: state.clock().playing.read().unwrap().clone(),
state: Some(state.clock().transport.query_state().unwrap()),
bpm: state.clock().bpm().get(),
sync: state.clock().sync.get(),
quant: state.clock().quant.get(),
beat: state.clock().current.format_beat(),
msu: state.clock().current.usec.format_msu(),
beat: state.clock().playhead.format_beat(),
msu: state.clock().playhead.usec.format_msu(),
}
}
}