From 852522208e65bd92221dec7c40e366e54a5595e1 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Sun, 6 Apr 2025 02:31:04 +0300 Subject: [PATCH 1/2] midi: reenable opening in/out ports --- midi/src/midi_player.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/midi/src/midi_player.rs b/midi/src/midi_player.rs index 1f2b62ee..34660ef9 100644 --- a/midi/src/midi_player.rs +++ b/midi/src/midi_player.rs @@ -63,18 +63,18 @@ impl Default for MidiPlayer { } impl MidiPlayer { pub fn new ( - name: impl AsRef, - _jack: &Jack, - clock: Option<&Clock>, - clip: Option<&Arc>>, - _midi_from: &[PortConnect], - _midi_to: &[PortConnect], + name: impl AsRef, + jack: &Jack, + clock: Option<&Clock>, + clip: Option<&Arc>>, + midi_from: &[PortConnect], + midi_to: &[PortConnect], ) -> Usually { let _name = name.as_ref(); let clock = clock.cloned().unwrap_or_default(); Ok(Self { - midi_ins: vec![],//JackMidiIn::new(jack, format!("M/{name}"), midi_from)?,], - midi_outs: vec![],//JackMidiOut::new(jack, format!("{name}/M"), midi_to)?, ], + midi_ins: vec![JackMidiIn::new(jack, format!("M/{}", name.as_ref()), midi_from)?,], + midi_outs: vec![JackMidiOut::new(jack, format!("{}/M", name.as_ref()), midi_to)?, ], play_clip: clip.map(|clip|(Moment::zero(&clock.timebase), Some(clip.clone()))), clock, note_buf: vec![0;8], From c7ee3185c1d0cdfd396bcbbf5bd571113f51dea0 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Sun, 6 Apr 2025 02:32:09 +0300 Subject: [PATCH 2/2] swap status bars --- app/edn/view_arranger.edn | 13 ++++--------- app/src/view/view_clock.rs | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/app/edn/view_arranger.edn b/app/edn/view_arranger.edn index 79aa05ed..22e10b83 100644 --- a/app/edn/view_arranger.edn +++ b/app/edn/view_arranger.edn @@ -1,9 +1,4 @@ -(bsp/n - (fixed/y 1 :transport) - (bsp/s - (fixed/y 1 :status) - (fill/xy - (bsp/a - (fill/xy - (align/e :pool)) - :arranger)))) +(bsp/s (fixed/y 1 :transport) + (bsp/n (fixed/y 1 :status) + (fill/xy (bsp/a (fill/xy (align/e :pool)) + :arranger)))) diff --git a/app/src/view/view_clock.rs b/app/src/view/view_clock.rs index dc87dfa1..03a5e1c4 100644 --- a/app/src/view/view_clock.rs +++ b/app/src/view/view_clock.rs @@ -29,7 +29,7 @@ impl Tek { fmtd.bpm.update(None, rewrite!(buf, "---.---")); } } - pub(crate) fn view_status (&self) -> impl Content + use<'_> { + pub(crate) fn view_transport (&self) -> impl Content + use<'_> { self.update_clock(); let theme = ItemPalette::G[96]; let fmtd = self.fmtd.read().unwrap(); @@ -42,7 +42,7 @@ impl Tek { ))) )))) } - pub(crate) fn view_transport (&self) -> impl Content + use<'_> { + pub(crate) fn view_status (&self) -> impl Content + use<'_> { self.update_clock(); let theme = ItemPalette::G[96]; let fmtd = self.fmtd.read().unwrap();