wip: cleanup, begin reconnecting ports

This commit is contained in:
🪞👃🪞 2025-01-09 18:31:42 +01:00
parent e8430c373f
commit 0cca06e054
5 changed files with 41 additions and 29 deletions

View file

@ -114,9 +114,9 @@ pub fn main () -> Usually<()> {
None, Some(ItemColor::random().into())
)));
let midi_in = jack.read().unwrap().register_port("i", MidiIn::default())?;
connect_from(&jack, &midi_in, &midi_from)?;
connect_from(jack, &midi_in, &midi_from)?;
let midi_out = jack.read().unwrap().register_port("o", MidiOut::default())?;
connect_to(&jack, &midi_out, &midi_to)?;
connect_to(jack, &midi_out, &midi_to)?;
Sequencer {
_jack: jack.clone(),
pool: PoolModel::from(&phrase),
@ -156,9 +156,13 @@ pub fn main () -> Usually<()> {
TekMode::Groovebox {
midi_from, midi_to, l_from, r_from, l_to, r_to, ..
} => engine.run(&jack.activate_with(|jack|Ok({
let ppq = 96;
let phrase = Arc::new(RwLock::new(MidiClip::new(
"Clip", true, 4 * player.clock.timebase.ppq.get() as usize,
None, Some(ItemColor::random().into())
"Clip",
true,
4 * ppq,
None,
Some(ItemColor::random().into())
)));
let mut player = MidiPlayer::new(jack, &"sequencer", Some(&phrase),
&midi_from,
@ -166,9 +170,9 @@ pub fn main () -> Usually<()> {
)?;
player.play_phrase = Some((Moment::zero(&player.clock.timebase), Some(phrase.clone())));
let sampler = Sampler::new(jack, &"sampler",
midi_from,
&[l_from, r_from],
&[l_to, r_to ],
&midi_from,
&[&l_from, &r_from],
&[&l_to, &r_to ],
)?;
jack.read().unwrap().client().connect_ports(
&player.midi_outs[0],