wip: modularize once again

This commit is contained in:
🪞👃🪞 2025-01-08 18:50:15 +01:00
parent e08c9d1790
commit 3b6ff81dad
44 changed files with 984 additions and 913 deletions

View file

@ -1,12 +1,5 @@
#[allow(unused_imports)] use std::sync::Arc;
use tek::*;
#[allow(unused_imports)] use clap::{self, Parser, Subcommand, ValueEnum};
#[allow(unused_imports)] use tek::{
*,
jack::*,
tek_input::*,
tek_output::*,
tek_tui::{*, ratatui::prelude::Color}
};
#[derive(Debug, Parser)]
#[command(version, about, long_about = None)]
@ -105,73 +98,131 @@ pub fn main () -> Usually<()> {
let jack = JackConnection::new(name)?;
let engine = Tui::new()?;
Ok(match cli.mode {
Clock =>
engine.run(&jack.activate_with(|jack|Ok(
crate::TransportTui::new(jack)?
))?)?,
Sequencer { midi_from, midi_to, .. } =>
engine.run(&jack.activate_with(|jack|Ok({
let mut app = crate::Sequencer::new(jack)?;
let jack = jack.read().unwrap();
let midi_in = jack.register_port("i", MidiIn::default())?;
let midi_out = jack.register_port("o", MidiOut::default())?;
connect_from(&jack, &midi_in, &midi_from)?;
connect_to(&jack, &midi_out, &midi_to)?;
app.player.midi_ins.push(midi_in);
app.player.midi_outs.push(midi_out);
app
}))?)?,
Sampler { midi_from, l_from, r_from, l_to, r_to, .. } =>
engine.run(&jack.activate_with(|jack|Ok(
tek::SamplerTui {
cursor: (0, 0),
editing: None,
mode: None,
size: Measure::new(),
note_lo: 36.into(),
note_pt: 36.into(),
color: ItemPalette::from(Color::Rgb(64, 128, 32)),
state: tek::Sampler::new(
jack, &"sampler",
&midi_from,
&[&l_from, &r_from],
&[&l_to, &r_to],
)?,
}
))?)?,
Groovebox { midi_from, midi_to, l_from, r_from, l_to, r_to, .. } =>
engine.run(&jack.activate_with(|jack|Ok({
let app = tek::Groovebox::new(
jack,
&midi_from, &midi_to,
Clock => engine.run(&jack.activate_with(|jack|Ok(crate::TransportTui {
clock: crate::Clock::from(jack),
jack: jack.clone()
}))?)?,
Sequencer {
midi_from,
midi_to, ..
} => engine.run(&jack.activate_with(|jack|Ok({
let clock = crate::Clock::from(jack);
let phrase = Arc::new(RwLock::new(crate::MidiClip::new(
"Clip", true, 4 * clock.timebase.ppq.get() as usize,
None, Some(ItemColor::random().into())
)));
let midi_in = jack.read().unwrap().register_port("i", MidiIn::default())?;
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)?;
crate::Sequencer {
_jack: jack.clone(),
pool: PoolModel::from(&phrase),
editor: crate::MidiEditor::from(&phrase),
player: crate::MidiPlayer::new(&clock, &phrase, &[midi_in], &[midi_out])?,
compact: true,
transport: true,
selectors: true,
size: Measure::new(),
midi_buf: vec![vec![];65536],
note_buf: vec![],
perf: PerfModel::default(),
status: true,
clock,
}
}))?)?,
Sampler {
midi_from, l_from, r_from, l_to, r_to, ..
} => engine.run(&jack.activate_with(|jack|Ok(
tek::SamplerTui {
cursor: (0, 0),
editing: None,
mode: None,
size: Measure::new(),
note_lo: 36.into(),
note_pt: 36.into(),
color: ItemPalette::from(Color::Rgb(64, 128, 32)),
state: tek::Sampler::new(jack, &"sampler",
&midi_from,
&[&l_from, &r_from],
&[&l_to, &r_to],
)?;
if let Some(bpm) = cli.bpm {
app.clock().timebase.bpm.set(bpm);
}
if cli.sync_lead {
jack.read().unwrap().client().register_timebase_callback(false, |mut state|{
app.clock().playhead.update_from_sample(state.position.frame() as f64);
state.position.bbt = Some(app.clock().bbt());
state.position
})?
} else if cli.sync_follow {
jack.read().unwrap().client().register_timebase_callback(false, |state|{
app.clock().playhead.update_from_sample(state.position.frame() as f64);
state.position
})?
}
app
}))?)?,
Arranger { scenes, tracks, track_width, midi_from, midi_to, .. } =>
engine.run(&jack.activate_with(|jack|Ok({
let mut app = crate::Arranger::try_from(jack)?;
app.color = ItemPalette::random();
app.tracks_add(tracks, track_width, midi_from.as_slice(), midi_to.as_slice())?;
app.scenes_add(scenes)?;
app
}))?)?,
&[&l_to, &r_to],
)?,
}
))?)?,
Groovebox {
midi_from, midi_to, l_from, r_from, l_to, r_to, ..
} => engine.run(&jack.activate_with(|jack|Ok({
let phrase = Arc::new(RwLock::new(MidiClip::new(
"Clip", true, 4 * player.clock.timebase.ppq.get() as usize,
None, Some(ItemColor::random().into())
)));
let mut player = crate::midi::MidiPlayer::new(jack, &"sequencer", Some(&phrase),
&midi_from,
&midi_to
)?;
player.play_phrase = Some((Moment::zero(&player.clock.timebase), Some(phrase.clone())));
let sampler = crate::sampler::Sampler::new(jack, &"sampler",
midi_from,
&[l_from, r_from],
&[l_to, r_to ],
)?;
jack.read().unwrap().client().connect_ports(
&player.midi_outs[0],
&sampler.midi_in
)?;
let app = tek::Groovebox {
player,
sampler,
_jack: jack.clone(),
pool: PoolModel::from(&phrase),
editor: MidiEditor::from(&phrase),
compact: true,
status: true,
size: Measure::new(),
midi_buf: vec![vec![];65536],
note_buf: vec![],
perf: PerfModel::default(),
};
let app = tek::Groovebox::new(
jack,
&midi_from, &midi_to,
&[&l_from, &r_from],
&[&l_to, &r_to],
)?;
if let Some(bpm) = cli.bpm {
app.clock().timebase.bpm.set(bpm);
}
if cli.sync_lead {
jack.read().unwrap().client().register_timebase_callback(false, |mut state|{
app.clock().playhead.update_from_sample(state.position.frame() as f64);
state.position.bbt = Some(app.clock().bbt());
state.position
})?
} else if cli.sync_follow {
jack.read().unwrap().client().register_timebase_callback(false, |state|{
app.clock().playhead.update_from_sample(state.position.frame() as f64);
state.position
})?
}
app
}))?)?,
Arranger {
scenes, tracks, track_width, midi_from, midi_to, ..
} => engine.run(&jack.activate_with(|jack|Ok({
let mut app = crate::Arranger::new(jack);
app.tracks_add(tracks, track_width, midi_from.as_slice(), midi_to.as_slice())?;
app.scenes_add(scenes)?;
app
}))?)?,
_ => todo!()
})
}