Compare commits

..

No commits in common. "c7ee3185c1d0cdfd396bcbbf5bd571113f51dea0" and "98d56e70092f1eccfb70bfd057258f02f8d00fe1" have entirely different histories.

3 changed files with 19 additions and 14 deletions

View file

@ -1,4 +1,9 @@
(bsp/s (fixed/y 1 :transport)
(bsp/n (fixed/y 1 :status)
(fill/xy (bsp/a (fill/xy (align/e :pool))
:arranger))))
(bsp/n
(fixed/y 1 :transport)
(bsp/s
(fixed/y 1 :status)
(fill/xy
(bsp/a
(fill/xy
(align/e :pool))
:arranger))))

View file

@ -29,7 +29,7 @@ impl Tek {
fmtd.bpm.update(None, rewrite!(buf, "---.---"));
}
}
pub(crate) fn view_transport (&self) -> impl Content<TuiOut> + use<'_> {
pub(crate) fn view_status (&self) -> impl Content<TuiOut> + 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_status (&self) -> impl Content<TuiOut> + use<'_> {
pub(crate) fn view_transport (&self) -> impl Content<TuiOut> + use<'_> {
self.update_clock();
let theme = ItemPalette::G[96];
let fmtd = self.fmtd.read().unwrap();

View file

@ -63,18 +63,18 @@ impl Default for MidiPlayer {
}
impl MidiPlayer {
pub fn new (
name: impl AsRef<str>,
jack: &Jack,
clock: Option<&Clock>,
clip: Option<&Arc<RwLock<MidiClip>>>,
midi_from: &[PortConnect],
midi_to: &[PortConnect],
name: impl AsRef<str>,
_jack: &Jack,
clock: Option<&Clock>,
clip: Option<&Arc<RwLock<MidiClip>>>,
_midi_from: &[PortConnect],
_midi_to: &[PortConnect],
) -> Usually<Self> {
let _name = name.as_ref();
let clock = clock.cloned().unwrap_or_default();
Ok(Self {
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)?, ],
midi_ins: vec![],//JackMidiIn::new(jack, format!("M/{name}"), midi_from)?,],
midi_outs: vec![],//JackMidiOut::new(jack, format!("{name}/M"), midi_to)?, ],
play_clip: clip.map(|clip|(Moment::zero(&clock.timebase), Some(clip.clone()))),
clock,
note_buf: vec![0;8],