From 94a16b9dbca1cffa311d370721e0c3046ff74425 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Thu, 21 Nov 2024 18:42:57 +0100 Subject: [PATCH] wip: fixing runtime crashes, pt.1 (you thought this was over?) --- crates/tek_tui/src/tui_content.rs | 2 +- crates/tek_tui/src/tui_impls.rs | 58 +++++++++++++++---------------- crates/tek_tui/src/tui_init.rs | 4 +-- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/crates/tek_tui/src/tui_content.rs b/crates/tek_tui/src/tui_content.rs index b5d05be8..ca55d413 100644 --- a/crates/tek_tui/src/tui_content.rs +++ b/crates/tek_tui/src/tui_content.rs @@ -12,7 +12,7 @@ impl<'a, T: TransportViewState> Content for TransportView<'a, T> { Some(TransportState::Rolling) => "▶ PLAYING", Some(TransportState::Starting) => "READY ...", Some(TransportState::Stopped) => "⏹ STOPPED", - _ => unreachable!(), + _ => "???", } ).min_xy(11, 2).push_x(1)).align_x().fill_x(), diff --git a/crates/tek_tui/src/tui_impls.rs b/crates/tek_tui/src/tui_impls.rs index 221450f0..5889444f 100644 --- a/crates/tek_tui/src/tui_impls.rs +++ b/crates/tek_tui/src/tui_impls.rs @@ -58,59 +58,59 @@ macro_rules! impl_midi_player { &mut self$(.$field)*.reset } fn phrase (&self) -> &Option<(Instant, Option>>)> { - todo!() + todo!("phrase") } fn phrase_mut (&self) -> &mut Option<(Instant, Option>>)> { - todo!() + todo!("phrase_mut") } fn next_phrase (&self) -> &Option<(Instant, Option>>)> { - todo!() + todo!("next_phrase") } fn next_phrase_mut (&mut self) -> &mut Option<(Instant, Option>>)> { - todo!() + todo!("next_phrase_mut") } } impl MidiInputApi for $Struct { - fn midi_ins(&self) -> &Vec> { - todo!() + fn midi_ins (&self) -> &Vec> { + todo!("midi_ins") } - fn midi_ins_mut(&self) -> &mut Vec> { - todo!() + fn midi_ins_mut (&self) -> &mut Vec> { + todo!("midi_ins_mut") } - fn recording(&self) -> bool { - todo!() + fn recording (&self) -> bool { + todo!("recording") } - fn recording_mut(&mut self) -> &mut bool { - todo!() + fn recording_mut (&mut self) -> &mut bool { + todo!("recording_mut") } - fn monitoring(&self) -> bool { - todo!() + fn monitoring (&self) -> bool { + todo!("monitoring") } - fn monitoring_mut(&mut self) -> &mut bool { - todo!() + fn monitoring_mut (&mut self) -> &mut bool { + todo!("monitoring_mut") } - fn overdub(&self) -> bool { - todo!() + fn overdub (&self) -> bool { + todo!("overdub") } - fn overdub_mut(&mut self) -> &mut bool { - todo!() + fn overdub_mut (&mut self) -> &mut bool { + todo!("overdub_mut") } - fn notes_in(&self) -> &Arc> { - todo!() + fn notes_in (&self) -> &Arc> { + todo!("notes_in") } } impl MidiOutputApi for $Struct { fn midi_outs (&self) -> &Vec> { - todo!() + todo!("midi_outs") } fn midi_outs_mut (&mut self) -> &mut Vec> { - todo!() + todo!("midi_outs_mut") } fn midi_note (&mut self) -> &mut Vec { - todo!() + todo!("midi_note") } fn notes_out (&self) -> &Arc> { - todo!() + todo!("notes_out") } } impl MidiPlayerApi for $Struct {} @@ -144,10 +144,10 @@ macro_rules! impl_phrase_editor_control { //state.editor.phrase = phrase.clone(); //state.focus(ArrangerFocus::PhraseEditor); //state.focus_enter(); - todo!() + todo!("edit_phrase") } fn editing_phrase (&self) -> &Option>> { - todo!() + todo!("editing_phrase") } fn phrase_editor_entered (&self) -> bool { self.entered && self.focused() == $Focus @@ -165,7 +165,7 @@ macro_rules! impl_phrase_editor_control { &mut self.editor.note_len } fn put_note (&mut self) { - todo!() + todo!("put_note") } } } diff --git a/crates/tek_tui/src/tui_init.rs b/crates/tek_tui/src/tui_init.rs index 6ca779de..01f80615 100644 --- a/crates/tek_tui/src/tui_init.rs +++ b/crates/tek_tui/src/tui_init.rs @@ -26,7 +26,7 @@ impl TryFrom<&Arc>> for SequencerTui { cursor: (0, 0), entered: false, split: 20, - midi_buf: vec![], + midi_buf: vec![vec![];65536], note_buf: vec![], transport, }) @@ -54,7 +54,7 @@ impl TryFrom<&Arc>> for ArrangerTui { entered: false, menu_bar: None, status_bar: None, - midi_buf: vec![], + midi_buf: vec![vec![];65536], note_buf: vec![], }) }