diff --git a/crates/tek_sequencer/src/sequencer.rs b/crates/tek_sequencer/src/sequencer.rs index d1637f6e..9c87d68c 100644 --- a/crates/tek_sequencer/src/sequencer.rs +++ b/crates/tek_sequencer/src/sequencer.rs @@ -869,22 +869,22 @@ impl TransportToolbar { pub fn new (transport: Option) -> Self { let timebase = Arc::new(Timebase::default()); Self { - _engine: Default::default(), - focused: false, - focus: TransportToolbarFocus::PlayPause, - playing: Some(TransportState::Stopped), - bpm: timebase.bpm(), - quant: 24, - sync: timebase.ppq() as usize * 4, - frame: 0, - pulse: 0, - ppq: 0, - usecs: 0, - transport, - timebase, + _engine: Default::default(), + focused: false, + focus: TransportToolbarFocus::PlayPause, + playing: Some(TransportState::Stopped), + bpm: timebase.bpm(), + quant: 24, + sync: timebase.ppq() as usize * 4, + frame: 0, + pulse: 0, + ppq: 0, + usecs: 0, metronome: false, started: None, jack: None, + transport, + timebase, } } pub fn toggle_play (&mut self) -> Usually<()> { diff --git a/crates/tek_sequencer/src/sequencer_tui.rs b/crates/tek_sequencer/src/sequencer_tui.rs index 70901001..37db6d56 100644 --- a/crates/tek_sequencer/src/sequencer_tui.rs +++ b/crates/tek_sequencer/src/sequencer_tui.rs @@ -150,16 +150,13 @@ impl<'a> Content for VerticalArranger<'a, Tui> { fn content (&self) -> impl Widget { let Self(state, factor) = self; let ppq = 96; - let (cols, rows) = match factor { - 0 => ( - track_clip_name_lengths(state.tracks.as_slice()), - scene_ppqs(state.tracks.as_slice(), state.scenes.as_slice()), - ), - factor => ( - track_clip_name_lengths(state.tracks.as_slice()), - (0..=state.scenes.len()).map(|i|(factor*ppq, factor*ppq*i)).collect::>(), - ), - }; + let (cols, rows) = if *factor == 0 {( + track_clip_name_lengths(state.tracks.as_slice()), + scene_ppqs(state.tracks.as_slice(), state.scenes.as_slice()), + )} else {( + track_clip_name_lengths(state.tracks.as_slice()), + (0..=state.scenes.len()).map(|i|(factor*ppq, factor*ppq*i)).collect::>(), + )}; //let height = rows.last().map(|(w,y)|(y+w)/ppq).unwrap_or(16); let tracks: &[Sequencer] = state.tracks.as_ref(); let scenes: &[Scene] = state.scenes.as_ref();