just formatting

This commit is contained in:
🪞👃🪞 2024-10-03 14:56:47 +03:00
parent c642998680
commit 47cdf5869b
2 changed files with 20 additions and 23 deletions

View file

@ -869,22 +869,22 @@ impl<E: Engine> TransportToolbar<E> {
pub fn new (transport: Option<Transport>) -> Self { pub fn new (transport: Option<Transport>) -> Self {
let timebase = Arc::new(Timebase::default()); let timebase = Arc::new(Timebase::default());
Self { Self {
_engine: Default::default(), _engine: Default::default(),
focused: false, focused: false,
focus: TransportToolbarFocus::PlayPause, focus: TransportToolbarFocus::PlayPause,
playing: Some(TransportState::Stopped), playing: Some(TransportState::Stopped),
bpm: timebase.bpm(), bpm: timebase.bpm(),
quant: 24, quant: 24,
sync: timebase.ppq() as usize * 4, sync: timebase.ppq() as usize * 4,
frame: 0, frame: 0,
pulse: 0, pulse: 0,
ppq: 0, ppq: 0,
usecs: 0, usecs: 0,
transport,
timebase,
metronome: false, metronome: false,
started: None, started: None,
jack: None, jack: None,
transport,
timebase,
} }
} }
pub fn toggle_play (&mut self) -> Usually<()> { pub fn toggle_play (&mut self) -> Usually<()> {

View file

@ -150,16 +150,13 @@ impl<'a> Content for VerticalArranger<'a, Tui> {
fn content (&self) -> impl Widget<Engine = Tui> { fn content (&self) -> impl Widget<Engine = Tui> {
let Self(state, factor) = self; let Self(state, factor) = self;
let ppq = 96; let ppq = 96;
let (cols, rows) = match factor { let (cols, rows) = if *factor == 0 {(
0 => ( track_clip_name_lengths(state.tracks.as_slice()),
track_clip_name_lengths(state.tracks.as_slice()), scene_ppqs(state.tracks.as_slice(), state.scenes.as_slice()),
scene_ppqs(state.tracks.as_slice(), state.scenes.as_slice()), )} else {(
), track_clip_name_lengths(state.tracks.as_slice()),
factor => ( (0..=state.scenes.len()).map(|i|(factor*ppq, factor*ppq*i)).collect::<Vec<_>>(),
track_clip_name_lengths(state.tracks.as_slice()), )};
(0..=state.scenes.len()).map(|i|(factor*ppq, factor*ppq*i)).collect::<Vec<_>>(),
),
};
//let height = rows.last().map(|(w,y)|(y+w)/ppq).unwrap_or(16); //let height = rows.last().map(|(w,y)|(y+w)/ppq).unwrap_or(16);
let tracks: &[Sequencer<Tui>] = state.tracks.as_ref(); let tracks: &[Sequencer<Tui>] = state.tracks.as_ref();
let scenes: &[Scene] = state.scenes.as_ref(); let scenes: &[Scene] = state.scenes.as_ref();