api: compact

This commit is contained in:
🪞👃🪞 2025-04-26 21:20:06 +03:00
parent e4808f8fc1
commit 3ef3d5eb6f
22 changed files with 441 additions and 558 deletions

View file

@ -1,437 +1,192 @@
use crate::*;
expose!([self: Tek] {
[bool] => {}
[isize] => {}
[Color] => {}
[Arc<RwLock<MidiClip>>] => {}
[u16] => { ":w-sidebar" => self.w_sidebar(), }
[usize] => { ":scene-last" => self.scenes.len(),
":track-last" => self.tracks.len(), }
[Option<usize>] => { ":scene" => self.selected.scene(),
":track" => self.selected.track(), }
[Option<Arc<RwLock<MidiClip>>>] => {
":clip" => match self.selected {
Selection::Clip(t, s) => self.scenes[s].clips[t].clone(),
_ => None
}
}
[Selection] => {
":scene-next" => self.selected.scene_next(self.scenes.len()),
":scene-prev" => self.selected.scene_prev(),
":track-next" => self.selected.track_next(self.tracks.len()),
":track-prev" => self.selected.track_prev(),
}
type MaybeClip = Option<Arc<RwLock<MidiClip>>>;
macro_rules! ns { ($C:ty, $s:expr, $a:expr, $W:expr) => { <$C>::try_from_expr($s, $a).map($W) } }
macro_rules! cmd { ($cmd:expr) => {{ $cmd; None }}; }
macro_rules! cmd_todo { ($msg:literal) => {{ println!($msg); None }}; }
view!(TuiOut: |self: Tek| self.size.of(View(self, self.view)); {
":nil" => Box::new("nil"),
":modal" => self.view_modal(),
":status" => self.view_status(),
":transport" => self.view_transport(),
":arranger" => self.view_arranger(),
":pool" => self.view_pool(),
":editor" => self.editor().map(|e|Bsp::n(Bsp::e(e.clip_status(), e.edit_status()), e)),
":samples-keys" => self.sampler().map(|s|s.view_list(false, self.editor().unwrap())),
":samples-grid" => self.sampler().map(|s|s.view_grid()),
":sample-viewer" => self.sampler().map(|s|s.view_sample(self.editor().unwrap().note_pos())),
});
impose!([app: Tek] {
expose!([self: Tek]
([bool])
([isize])
([Color])
([Arc<RwLock<MidiClip>>])
([u7] (":pitch" (self.editor().map(|e|e.note_pos()).unwrap() as u8).into()))
([u16] (":w-sidebar" self.w_sidebar()))
([usize] (":scene-last" self.scenes.len())
(":track-last" self.tracks.len()))
([Option<usize>] (":scene" self.selected.scene())
(":track" self.selected.track()))
([MaybeClip]
(":clip" match self.selected {
Selection::Clip(t, s) => self.scenes[s].clips[t].clone(),
_ => None
}))
([Selection]
(":scene-next" self.selected.scene_next(self.scenes.len()))
(":scene-prev" self.selected.scene_prev())
(":track-next" self.selected.track_next(self.tracks.len()))
(":track-prev" self.selected.track_prev())));
TekCommand => {
impose!([app: Tek]
(TekCommand:
("menu" [] Some(Self::ToggleMenu))
("help" [] Some(Self::ToggleHelp))
("stop" [] Some(Self::StopAll))
("undo" [d: usize] Some(Self::History(-(d.unwrap_or(0)as isize))))
("undo" [d: usize] Some(Self::History(-(d.unwrap_or(0) as isize))))
("redo" [d: usize] Some(Self::History(d.unwrap_or(0) as isize)))
("zoom" [z: usize] Some(Self::Zoom(z)))
("edit" [] Some(Self::Edit(None)))
("edit" [c: bool] Some(Self::Edit(c)))
("color" [] Some(Self::Color(ItemPalette::random())))
("color" [c: Color] Some(Self::Color(c.map(ItemPalette::from).expect("no color"))))
("color" [] Some(Self::Color(ItemTheme::random())))
("color" [c: Color] Some(Self::Color(c.map(ItemTheme::from).expect("no color"))))
("enqueue" [c: Arc<RwLock<MidiClip>>] Some(Self::Enqueue(c)))
("launch" [] Some(Self::Launch))
("scene" [,..a] SceneCommand::try_from_expr(app, a).map(Self::Scene))
("track" [,..a] TrackCommand::try_from_expr(app, a).map(Self::Track))
("input" [,..a] InputCommand::try_from_expr(app, a).map(Self::Input))
("output" [,..a] OutputCommand::try_from_expr(app, a).map(Self::Output))
("select" [t: Selection] Some(t.map(Self::Select).expect("no selection")))
("clip" [,..a] ClipCommand::try_from_expr(app, a)
.map(Self::Clip))
("clock" [,..a] ClockCommand::try_from_expr(app.clock(), a)
.map(Self::Clock))
("editor" [,..a] MidiEditCommand::try_from_expr(app.editor.as_ref().expect("no editor"), a)
.map(Self::Editor))
("pool" [,..a] PoolCommand::try_from_expr(app.pool.as_ref().expect("no pool"), a)
.map(Self::Pool))
("clock" [,..a] ns!(ClockCommand, app.clock(), a, Self::Clock))
("scene" [,..a] ns!(SceneCommand, app, a, Self::Scene))
("track" [,..a] ns!(TrackCommand, app, a, Self::Track))
("input" [,..a] ns!(InputCommand, app, a, Self::Input))
("output" [,..a] ns!(OutputCommand, app, a, Self::Output))
("clip" [,..a] ns!(ClipCommand, app, a, Self::Clip))
("pool" [,..a] app.pool.as_ref().map(|p|ns!(PoolCommand, p, a, Self::Pool)).flatten())
("editor" [,..a] app.editor().map(|e|ns!(MidiEditCommand, e, a, Self::Editor)).flatten())
("sampler" [,..a] app.sampler().map(|s|ns!(SamplerCommand, s, a, Self::Sampler)).flatten())
("select" [t: usize, s: usize] Some(match (t.expect("no track"), s.expect("no scene")) {
(0, 0) => Self::Select(Selection::Mix),
(t, 0) => Self::Select(Selection::Track(t)),
(0, s) => Self::Select(Selection::Scene(s)),
(t, s) => Self::Select(Selection::Clip(t, s)),
}))
//("sampler" [,..a]
// Self::Sampler( //SamplerCommand::try_from_expr(app.sampler().as_ref().expect("no sampler"), a).expect("invalid command")))
}
ClipCommand => {
("get" [a: usize, b: usize] Some(Self::Get(a.unwrap(), b.unwrap())))
("put" [a: usize, b: usize, c: Option<Arc<RwLock<MidiClip>>>] Some(Self::Put(a.unwrap(), b.unwrap(), c.unwrap())))
(t, s) => Self::Select(Selection::Clip(t, s)) })))
(ClipCommand:
("edit" [a: MaybeClip] Some(Self::Edit(a.unwrap())))
("color" [a: usize, b: usize] Some(Self::SetColor(a.unwrap(), b.unwrap(), ItemTheme::random())))
("enqueue" [a: usize, b: usize] Some(Self::Enqueue(a.unwrap(), b.unwrap())))
("edit" [a: Option<Arc<RwLock<MidiClip>>>] Some(Self::Edit(a.unwrap())))
("get" [a: usize, b: usize] Some(Self::Get(a.unwrap(), b.unwrap())))
("loop" [a: usize, b: usize, c: bool] Some(Self::SetLoop(a.unwrap(), b.unwrap(), c.unwrap())))
("color" [a: usize, b: usize] Some(Self::SetColor(a.unwrap(), b.unwrap(), ItemPalette::random())))
}
("put" [a: usize, b: usize, c: MaybeClip] Some(Self::Put(a.unwrap(), b.unwrap(), c.unwrap()))))
InputCommand => {
("add" [] Some(Self::Add))
}
(InputCommand:
("add" [] Some(Self::Add)))
OutputCommand => {
("add" [] Some(Self::Add))
}
(OutputCommand:
("add" [] Some(Self::Add)))
SceneCommand => {
("add" [] Some(Self::Add))
("del" [a: usize] Some(Self::Del(0)))
("zoom" [a: usize] Some(Self::SetZoom(a.unwrap())))
("color" [a: usize] Some(Self::SetColor(a.unwrap(), ItemPalette::G[128])))
("enqueue" [a: usize] Some(Self::Enqueue(a.unwrap())))
("swap" [a: usize, b: usize] Some(Self::Swap(a.unwrap(), b.unwrap())))
}
(SceneCommand:
("add" [] Some(Self::Add))
("del" [a: usize] Some(Self::Del(0)))
("zoom" [a: usize] Some(Self::SetZoom(a.unwrap())))
("color" [a: usize] Some(Self::SetColor(a.unwrap(), ItemTheme::G[128])))
("enqueue" [a: usize] Some(Self::Enqueue(a.unwrap())))
("swap" [a: usize, b: usize] Some(Self::Swap(a.unwrap(), b.unwrap()))))
TrackCommand => {
("add" [] Some(Self::Add))
("size" [a: usize] Some(Self::SetSize(a.unwrap())))
("zoom" [a: usize] Some(Self::SetZoom(a.unwrap())))
("color" [a: usize] Some(Self::SetColor(a.unwrap(), ItemPalette::random())))
("del" [a: usize] Some(Self::Del(a.unwrap())))
("stop" [a: usize] Some(Self::Stop(a.unwrap())))
(TrackCommand:
("add" [] Some(Self::Add))
("size" [a: usize] Some(Self::SetSize(a.unwrap())))
("zoom" [a: usize] Some(Self::SetZoom(a.unwrap())))
("color" [a: usize] Some(Self::SetColor(a.unwrap(), ItemTheme::random())))
("del" [a: usize] Some(Self::Del(a.unwrap())))
("stop" [a: usize] Some(Self::Stop(a.unwrap())))
("swap" [a: usize, b: usize] Some(Self::Swap(a.unwrap(), b.unwrap())))
("play" [] Some(Self::TogglePlay))
("solo" [] Some(Self::ToggleSolo))
("rec" [] Some(Self::ToggleRecord))
("mon" [] Some(Self::ToggleMonitor))
}
("play" [] Some(Self::TogglePlay))
("solo" [] Some(Self::ToggleSolo))
("rec" [] Some(Self::ToggleRec))
("mon" [] Some(Self::ToggleMon))));
});
defcom!([self, app: Tek]
defcom! { |self, app: Tek|
(TekCommand
(Sampler [cmd: SamplerCommand] cmd_todo!("\n\rtodo: sampler {cmd:?}"))
(Scene [cmd: SceneCommand] cmd.delegate(app, Self::Scene)?)
(Track [cmd: TrackCommand] cmd.delegate(app, Self::Track)?)
(Output [cmd: OutputCommand] cmd.delegate(app, Self::Output)?)
(Input [cmd: InputCommand] cmd.delegate(app, Self::Input)?)
(Clip [cmd: ClipCommand] cmd.delegate(app, Self::Clip)?)
(Clock [cmd: ClockCommand] cmd.delegate(app, Self::Clock)?)
(Editor [cmd: MidiEditCommand] delegate_to_editor(app, cmd)?)
(Pool [cmd: PoolCommand] delegate_to_pool(app, cmd)?)
(ToggleHelp [] cmd!({ app.modal = match app.modal { Some(Modal::Help) => None, _ => Some(Modal::Help) }}))
(ToggleMenu [] cmd!({ app.modal = match app.modal { Some(Modal::Menu) => None, _ => Some(Modal::Menu) }}))
(Color [p: ItemTheme] app.set_color(Some(p)).map(Self::Color))
(Enqueue [c: MaybeClip] cmd_todo!("\n\rtodo: enqueue {c:?}"))
(History [d: isize] cmd_todo!("\n\rtodo: history {d:?}"))
(Zoom [z: Option<usize>] cmd_todo!("\n\rtodo: zoom {z:?}"))
(Edit [value: Option<bool>] cmd!(app.toggle_editor(value)))
(Launch [] cmd!(app.launch()))
(Select [s: Selection] cmd!(app.select(s)))
(StopAll [] cmd!(app.stop_all())))
TekCommand {
(InputCommand
(Add [] cmd!(app.add_midi_in()?)))
ToggleHelp => {
app.modal = match app.modal {
Some(Modal::Help) => None,
_ => Some(Modal::Help)
};
None
}
(OutputCommand
(Add [] cmd!(app.add_midi_out()?)))
ToggleMenu => {
app.modal = match app.modal {
Some(Modal::Menu) => None,
_ => Some(Modal::Menu)
};
None
}
(TrackCommand
(TogglePlay [] Some(Self::TogglePlay))
(ToggleSolo [] Some(Self::ToggleSolo))
(SetSize [t: usize] cmd_todo!("\n\rtodo: {self:?}"))
(SetZoom [z: usize] cmd_todo!("\n\rtodo: {self:?}"))
(Swap [a: usize, b: usize] cmd_todo!("\n\rtodo: {self:?}"))
(Del [index: usize] cmd!(app.track_del(index)))
(Stop [index: usize] cmd!(app.tracks[index].player.enqueue_next(None)))
(Add [] Some(Self::Del(app.track_add_focus()?)))
(SetColor [i: usize, c: ItemTheme] Some(Self::SetColor(i, app.track_set_color(i, c))))
(ToggleRec [] { app.track_toggle_record(); Some(Self::ToggleRec) })
(ToggleMon [] { app.track_toggle_monitor(); Some(Self::ToggleMon) }))
Sampler(cmd: SamplerCommand) => {
println!("\n\rtodo: {cmd:?}");
None
}
(SceneCommand
(Swap [a: usize, b: usize] cmd_todo!("\n\rtodo: {self:?}"))
(SetSize [index: usize] cmd_todo!("\n\rtodo: {self:?}"))
(SetZoom [zoom: usize] cmd_todo!("\n\rtodo: {self:?}"))
(Enqueue [scene: usize] cmd!(app.scene_enqueue(scene)))
(Del [index: usize] cmd!(app.scene_del(index)))
(Add [] Some(Self::Del(app.scene_add_focus()?)))
(SetColor [i: usize, c: ItemTheme] Some(Self::SetColor(i, app.scene_set_color(i, c)))))
Enqueue(clip: Option<Arc<RwLock<MidiClip>>>) => {
println!("\n\rtodo: enqueue {clip:?}");
None
}
(ClipCommand
(Get [a: usize, b: usize] cmd_todo!("\n\rtodo: clip: get: {a} {b}"))
(Edit [clip: MaybeClip] cmd_todo!("\n\rtodo: clip: edit: {clip:?}"))
(SetLoop [t: usize, s: usize, l: bool] cmd_todo!("\n\rtodo: {self:?}"))
(Put [t: usize, s: usize, c: MaybeClip]
Some(Self::Put(t, s, app.clip_put(t, s, c))))
(Enqueue [t: usize, s: usize]
cmd!(app.tracks[t].player.enqueue_next(app.scenes[s].clips[t].as_ref())))
(SetColor [t: usize, s: usize, c: ItemTheme]
app.clip_set_color(t, s, c).map(|o|Self::SetColor(t, s, o)))));
History(delta: isize) => {
println!("\n\rtodo: {self:?}");
None
}
Zoom(zoom: Option<usize>) => {
println!("\n\rtodo: {self:?}");
None
}
Scene(cmd: SceneCommand) =>
cmd.delegate(app, Self::Scene)?
Track(cmd: TrackCommand) =>
cmd.delegate(app, Self::Track)?
Output(cmd: OutputCommand) =>
cmd.delegate(app, Self::Output)?
Input(cmd: InputCommand) =>
cmd.delegate(app, Self::Input)?
Clip(cmd: ClipCommand) =>
cmd.delegate(app, Self::Clip)?
Clock(cmd: ClockCommand) =>
cmd.delegate(app, Self::Clock)?
Editor(cmd: MidiEditCommand) => app.editor.as_mut()
.map(|editor|cmd.delegate(editor, Self::Editor))
.transpose()?
.flatten()
Pool(cmd: PoolCommand) => if let Some(pool) = app.pool.as_mut() {
let undo = cmd.clone().delegate(pool, Self::Pool)?;
if let Some(editor) = app.editor.as_mut() {
match cmd {
// autoselect: automatically load selected clip in editor
// autocolor: update color in all places simultaneously
PoolCommand::Select(_) | PoolCommand::Clip(PoolClipCommand::SetColor(_, _)) =>
editor.set_clip(pool.clip().as_ref()),
_ => {}
}
};
undo
} else {
None
}
Color(palette: ItemPalette) => {
use Selection::*;
Some(Self::Color(match app.selected {
Mix => {
let old = app.color;
app.color = palette;
old
},
Track(t) => {
let old = app.tracks[t].color;
app.tracks[t].color = palette;
old
}
Scene(s) => {
let old = app.scenes[s].color;
app.scenes[s].color = palette;
old
}
Clip(t, s) => {
if let Some(ref clip) = app.scenes[s].clips[t] {
let mut clip = clip.write().unwrap();
let old = clip.color;
clip.color = palette;
old
} else {
return Ok(None)
}
}
}))
}
Edit(value: Option<bool>) => {
let editing = app.is_editing();
let value = value.unwrap_or_else(||!app.is_editing());
app.editing.store(value, Relaxed);
if value {
app.clip_auto_create();
} else {
app.clip_auto_remove();
}
None
}
Launch => {
use Selection::*;
match app.selected {
Track(t) => app.tracks[t].player.enqueue_next(None),
Clip(t, s) => app.tracks[t].player.enqueue_next(app.scenes[s].clips[t].as_ref()),
Scene(s) => {
for t in 0..app.tracks.len() {
app.tracks[t].player.enqueue_next(app.scenes[s].clips[t].as_ref())
}
},
_ => {}
};
None
}
Select(s: Selection) => {
app.selected = s;
// autoedit: load focused clip in editor.
if let Some(ref mut editor) = app.editor {
editor.set_clip(match app.selected {
Selection::Clip(t, s) if let Some(Some(Some(clip))) = app
.scenes.get(s).map(|s|s.clips.get(t)) => Some(clip),
_ => None
});
}
None
}
StopAll => {
for track in 0..app.tracks.len(){app.tracks[track].player.enqueue_next(None);}
None
}
}
InputCommand {
Add => {
app.midi_ins.push(JackMidiIn::new(&app.jack, &format!("M/{}", app.midi_ins.len()), &[])?);
None
}
}
OutputCommand {
Add => {
app.midi_outs.push(JackMidiOut::new(&app.jack, &format!("{}/M", app.midi_outs.len()), &[])?);
None
}
}
TrackCommand {
Swap(a: usize, b: usize) => {
println!("\n\rtodo: {self:?}");
None
}
SetSize(t: usize) => {
println!("\n\rtodo: {self:?}");
None
}
SetZoom(z: usize) => {
println!("\n\rtodo: {self:?}");
None
}
Add => {
use Selection::*;
let index = app.track_add(None, None, &[], &[])?.0;
app.selected = match app.selected {
Track(t) => Track(index),
Clip(t, s) => Clip(index, s),
_ => app.selected
};
Some(Self::Del(index))
}
Del(index: usize) => {
app.track_del(index);
None
}
Stop(index: usize) => {
app.tracks[index].player.enqueue_next(None);
None
}
SetColor(index: usize, color: ItemPalette) => {
let old = app.tracks[index].color;
app.tracks[index].color = color;
Some(Self::SetColor(index, old))
}
TogglePlay => {
Some(Self::TogglePlay)
}
ToggleSolo => {
Some(Self::ToggleSolo)
}
ToggleRecord => {
if let Some(t) = app.selected.track() {
app.tracks[t-1].player.recording = !app.tracks[t-1].player.recording;
}
Some(Self::ToggleRecord)
}
ToggleMonitor => {
if let Some(t) = app.selected.track() {
app.tracks[t-1].player.monitoring = !app.tracks[t-1].player.monitoring;
}
Some(Self::ToggleMonitor)
}
}
SceneCommand {
Swap(a: usize, b: usize) => {
println!("\n\rtodo: {self:?}");
None
}
SetSize(index: usize) => {
println!("\n\rtodo: {self:?}");
None
}
SetZoom(zoom: usize) => {
println!("\n\rtodo: {self:?}");
None
}
Add => {
use Selection::*;
let index = app.scene_add(None, None)?.0;
app.selected = match app.selected {
Scene(s) => Scene(index),
Clip(t, s) => Clip(t, index),
_ => app.selected
};
Some(Self::Del(index))
}
Del(index: usize) => {
app.scene_del(index);
None
}
SetColor(index: usize, color: ItemPalette) => {
let old = app.scenes[index].color;
app.scenes[index].color = color;
Some(Self::SetColor(index, old))
}
Enqueue(scene: usize) => {
for track in 0..app.tracks.len() {
app.tracks[track].player.enqueue_next(app.scenes[scene].clips[track].as_ref());
}
None
}
}
ClipCommand {
Get(a: usize, b: usize) => {
println!("\n\rtodo: {self:?}");
None
}
Edit(clip: Option<Arc<RwLock<MidiClip>>>) => {
println!("\n\rtodo: edit {clip:?}");
None
}
SetLoop(track: usize, scene: usize, looped: bool) => {
println!("\n\rtodo: {self:?}");
None
}
Put(track: usize, scene: usize, clip: Option<Arc<RwLock<MidiClip>>>) => {
let old = app.scenes[scene].clips[track].clone();
app.scenes[scene].clips[track] = clip;
Some(Self::Put(track, scene, old))
}
Enqueue(track: usize, scene: usize) => {
app.tracks[track].player.enqueue_next(app.scenes[scene].clips[track].as_ref());
None
}
SetColor(track: usize, scene: usize, color: ItemPalette) => {
app.scenes[scene].clips[track].as_ref().map(|clip|{
let mut clip = clip.write().unwrap();
let old = clip.color.clone();
clip.color = color.clone();
panic!("{color:?} {old:?}");
Self::SetColor(track, scene, old)
})
}
}
fn delegate_to_editor (app: &mut Tek, cmd: MidiEditCommand) -> Perhaps<TekCommand> {
Ok(app.editor.as_mut().map(|editor|cmd.delegate(editor, TekCommand::Editor))
.transpose()?
.flatten())
}
fn delegate_to_pool (app: &mut Tek, cmd: PoolCommand) -> Perhaps<TekCommand> {
Ok(if let Some(pool) = app.pool.as_mut() {
let undo = cmd.clone().delegate(pool, TekCommand::Pool)?;
if let Some(editor) = app.editor.as_mut() {
match cmd {
// autoselect: automatically load selected clip in editor
// autocolor: update color in all places simultaneously
PoolCommand::Select(_) | PoolCommand::Clip(PoolClipCommand::SetColor(_, _)) =>
editor.set_clip(pool.clip().as_ref()),
_ => {}
}
};
undo
} else {
None
})
}