unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-07 12:16:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: unspeaker:74b497cf3a37c9bb60d11fedda8a24844daa1378
Branches Tags
unspeaker:main
unspeaker:refactor/arranger-device
unspeaker:0.2
unspeaker:refactor/api
unspeaker:0.3.0-rc.1
unspeaker:0.2.2
unspeaker:0.2.1
unspeaker:0.2.0
unspeaker:test-release
unspeaker:0.2.0-rc.7
unspeaker:0.2.0-rc.6
unspeaker:0.2.0-rc.5
unspeaker:0.2.0-rc.4
unspeaker:0.2.0-rc.3
unspeaker:0.2.0-rc2
unspeaker:0.2.0-alpha1
..
compare: unspeaker:4604ad66a2baeffd0d97bd1df3c31c6345c8f8db
Branches Tags
unspeaker:main
unspeaker:refactor/arranger-device
unspeaker:0.2
unspeaker:refactor/api
unspeaker:0.3.0-rc.1
unspeaker:0.2.2
unspeaker:0.2.1
unspeaker:0.2.0
unspeaker:test-release
unspeaker:0.2.0-rc.7
unspeaker:0.2.0-rc.6
unspeaker:0.2.0-rc.5
unspeaker:0.2.0-rc.4
unspeaker:0.2.0-rc.3
unspeaker:0.2.0-rc2
unspeaker:0.2.0-alpha1

No commits in common. "74b497cf3a37c9bb60d11fedda8a24844daa1378" and "4604ad66a2baeffd0d97bd1df3c31c6345c8f8db" have entirely different histories.
74b497cf3a ... 4604ad66a2

16 changed files with 88 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

90
crates/app/app.rs
View file

@ -218,27 +218,17 @@ impl App {
fn render_dsl <'t, S> (state: &'t S, src: &str) -> Box<dyn Render<TuiOut>> fn render_dsl <'t, S> (state: &'t S, src: &str) -> Box<dyn Render<TuiOut>>
where S: DslSymNs<'t, Box<dyn Render<TuiOut>>> + DslExpNs<'t, Box<dyn Render<TuiOut>>> where S: DslSymNs<'t, Box<dyn Render<TuiOut>>> + DslExpNs<'t, Box<dyn Render<TuiOut>>>
{ {
let sym_err: Option<Box<dyn Error>> = match state.from_sym(src) { if let Ok(Some(value)) = state.from_sym(src) { return value }
Ok(Some(value)) => return value, if let Ok(Some(value)) = state.from_exp(src) { return value }
Ok(None) => None, Box::new(Bsp::s(
Err(e) => Some(e), Fill::x(Align::w(Tui::bold(true, Tui::fg_bg(Color::Rgb(240,160,100), Color::Rgb(48,00,00),
}; "Could not render:")))),
let exp_err = match state.from_exp(src) { Max::x(40, Tui::fg_bg(Color::Rgb(250,200,120), Color::Rgb(32,00,00),
Ok(Some(value)) => return value, format!("{src}")))
Ok(None) => None, ))
Err(e) => Some(e),
};
let (err_fg_1, err_bg_1) = (Color::Rgb(240, 160, 100), Color::Rgb(48, 0, 0));
let (err_fg_2, err_bg_2) = (Color::Rgb(250, 200, 120), Color::Rgb(32, 0, 0));
Box::new(Fill::x(col! {
Fill::x(Margin::x(1, Align::w(Tui::bold(true, Tui::fg_bg(err_fg_1, err_bg_1, "Could not render:"))))),
Fill::x(Margin::x(1, Tui::fg_bg(err_fg_2, err_bg_2, format!("{src}")))),
Fill::x(Margin::x(1, Tui::fg_bg(err_fg_2, err_bg_2, format!("{sym_err:?}")))),
Fill::x(Margin::x(1, Tui::fg_bg(err_fg_2, err_bg_2, format!("{exp_err:?}")))),
}))
} }
dsl_exp_ns!(|app: App| -> Box<dyn Render<TuiOut>> { dsl_exp!(|app: App, tail| -> Box<dyn Render<TuiOut>> {
("bold", value: bool, x: Box<dyn Render<TuiOut>>) => Box::new(Tui::bold(value, x)), ("bold", value: bool, x: Box<dyn Render<TuiOut>>) => Box::new(Tui::bold(value, x)),
("fg", color: Color, x: Box<dyn Render<TuiOut>>) => Box::new(Tui::fg(color, x)), ("fg", color: Color, x: Box<dyn Render<TuiOut>>) => Box::new(Tui::fg(color, x)),
("bg", color: Color, x: Box<dyn Render<TuiOut>>) => Box::new(Tui::bg(color, x)), ("bg", color: Color, x: Box<dyn Render<TuiOut>>) => Box::new(Tui::bg(color, x)),
@ -249,26 +239,24 @@ dsl_exp_ns!(|app: App| -> Box<dyn Render<TuiOut>> {
("bsp/w", a: Box<dyn Render<TuiOut>>, b: Box<dyn Render<TuiOut>>) => Box::new(Bsp::w(a, b)), ("bsp/w", a: Box<dyn Render<TuiOut>>, b: Box<dyn Render<TuiOut>>) => Box::new(Bsp::w(a, b)),
("bsp/a", a: Box<dyn Render<TuiOut>>, b: Box<dyn Render<TuiOut>>) => Box::new(Bsp::a(a, b)), ("bsp/a", a: Box<dyn Render<TuiOut>>, b: Box<dyn Render<TuiOut>>) => Box::new(Bsp::a(a, b)),
("bsp/b", a: Box<dyn Render<TuiOut>>, b: Box<dyn Render<TuiOut>>) => Box::new(Bsp::b(a, b)), ("bsp/b", a: Box<dyn Render<TuiOut>>, b: Box<dyn Render<TuiOut>>) => Box::new(Bsp::b(a, b)),
("align/n", x: Box<dyn Render<TuiOut>>) => Box::new(Align::n(x)), ("align/n", x: Box<dyn Render<TuiOut>>) => Box::new(Align::n(a, b)),
("align/s", x: Box<dyn Render<TuiOut>>) => Box::new(Align::s(x)), ("align/s", x: Box<dyn Render<TuiOut>>) => Box::new(Align::s(a, b)),
("align/e", x: Box<dyn Render<TuiOut>>) => Box::new(Align::e(x)), ("align/e", x: Box<dyn Render<TuiOut>>) => Box::new(Align::e(a, b)),
("align/w", x: Box<dyn Render<TuiOut>>) => Box::new(Align::w(x)), ("align/w", x: Box<dyn Render<TuiOut>>) => Box::new(Align::w(a, b)),
("align/x", x: Box<dyn Render<TuiOut>>) => Box::new(Align::x(x)), ("align/x", x: Box<dyn Render<TuiOut>>) => Box::new(Align::x(a, b)),
("align/y", x: Box<dyn Render<TuiOut>>) => Box::new(Align::y(x)), ("align/y", x: Box<dyn Render<TuiOut>>) => Box::new(Align::y(a, b)),
("align/c", x: Box<dyn Render<TuiOut>>) => Box::new(Align::c(x)), ("align/c", x: Box<dyn Render<TuiOut>>) => Box::new(Align::c(a, b)),
("fill/x", x: Box<dyn Render<TuiOut>>) => Box::new(Fill::x(x)), ("fill/x", x: Box<dyn Render<TuiOut>>) => Box::new(Fill::x(x)),
("fill/y", x: Box<dyn Render<TuiOut>>) => Box::new(Fill::y(x)), ("fill/y", x: Box<dyn Render<TuiOut>>) => Box::new(Fill::y(x)),
("fill/xy", x: Box<dyn Render<TuiOut>>) => Box::new(Fill::xy(x)), ("fill/xy", x: Box<dyn Render<TuiOut>>) => Box::new(Fill::xy(x)),
}); });
dsl_exp_ns!(|app: App| -> Color { dsl_exp!(|app: App, tail| -> Color {
("g", n: u8) => ("rgb", r: u8, g: u8, b: u8) => Color::Rgb(r, g, b),
Color::Rgb(n, n, n), ("g", n: u8) => Color::Rgb(n. n. n),
("rgb", r: u8, g: u8, b: u8) =>
Color::Rgb(r, g, b),
}); });
dsl_sym_ns!(|app: App| -> Box<dyn Render<TuiOut>> { dsl_sym!(|app: App| -> Box<dyn Render<TuiOut>> {
":view/menu" => app.view(stringify!((bg (rgb 0 0 0) ":view/menu" => app.view(stringify!((bg (rgb 0 0 0)
(bsp/s :view/ports/outs (bsp/s (bg (rgb 33 33 33) (bold :true "tek 0.3.0-rc.0"))) (bsp/s :view/ports/outs (bsp/s (bg (rgb 33 33 33) (bold :true "tek 0.3.0-rc.0")))
@ -579,24 +567,24 @@ handle!(TuiIn:|self: App, input|{
//None //None
//}) //})
}); });
dsl_sym_ns!(|app: App| -> isize { dsl_sym!(|app: App| -> isize {
":_isize_stub" => -1 ":_isize_stub" => -1
}); });
dsl_sym_ns!(|app: App| -> ItemTheme { dsl_sym!(|app: App| -> ItemTheme {
":_theme_stub" => Default::default() ":_theme_stub" => Default::default()
}); });
dsl_sym_ns!(|app: App| -> u16{ dsl_sym!(|app: App| -> u16{
":w/sidebar" => app.project.w_sidebar(app.editor().is_some()), ":w/sidebar" => app.project.w_sidebar(app.editor().is_some()),
":h/sample-detail" => 6.max(app.height() as u16 * 3 / 9), ":h/sample-detail" => 6.max(app.height() as u16 * 3 / 9),
}); });
dsl_sym_ns!(|app: App| -> usize { dsl_sym!(|app: App| -> usize {
":scene-count" => app.scenes().len(), ":scene-count" => app.scenes().len(),
":track-count" => app.tracks().len(), ":track-count" => app.tracks().len(),
":device-kind" => app.dialog.device_kind().unwrap_or(0), ":device-kind" => app.dialog.device_kind().unwrap_or(0),
":device-kind/next" => app.dialog.device_kind_next().unwrap_or(0), ":device-kind/next" => app.dialog.device_kind_next().unwrap_or(0),
":device-kind/prev" => app.dialog.device_kind_prev().unwrap_or(0), ":device-kind/prev" => app.dialog.device_kind_prev().unwrap_or(0),
}); });
dsl_sym_ns!(|app: App| -> bool { dsl_sym!(|app: App| -> bool {
":focused/editor" => app.project.editor.is_some(), ":focused/editor" => app.project.editor.is_some(),
":focused/dialog" => !matches!(app.dialog, Dialog::None), ":focused/dialog" => !matches!(app.dialog, Dialog::None),
":focused/message" => matches!(app.dialog, Dialog::Message(..)), ":focused/message" => matches!(app.dialog, Dialog::Message(..)),
@ -611,7 +599,7 @@ dsl_sym_ns!(|app: App| -> bool {
":focused/pool/rename" => matches!(app.pool.mode, Some(PoolMode::Rename(..))), ":focused/pool/rename" => matches!(app.pool.mode, Some(PoolMode::Rename(..))),
":focused/pool/length" => matches!(app.pool.mode, Some(PoolMode::Length(..))), ":focused/pool/length" => matches!(app.pool.mode, Some(PoolMode::Length(..))),
}); });
dsl_sym_ns!(|app: App| -> Dialog { dsl_sym!(|app: App| -> Dialog {
":dialog/none" => Dialog::None, ":dialog/none" => Dialog::None,
":dialog/options" => Dialog::Options, ":dialog/options" => Dialog::Options,
":dialog/device" => Dialog::Device(0), ":dialog/device" => Dialog::Device(0),
@ -626,7 +614,7 @@ dsl_sym_ns!(|app: App| -> Dialog {
":dialog/import/sample" => Dialog::Browser(BrowserTarget::ImportSample(Default::default()), Browser::new(None).unwrap().into()), ":dialog/import/sample" => Dialog::Browser(BrowserTarget::ImportSample(Default::default()), Browser::new(None).unwrap().into()),
":dialog/export/sample" => Dialog::Browser(BrowserTarget::ExportSample(Default::default()), Browser::new(None).unwrap().into()), ":dialog/export/sample" => Dialog::Browser(BrowserTarget::ExportSample(Default::default()), Browser::new(None).unwrap().into()),
}); });
dsl_sym_ns!(|app: App| -> Selection { dsl_sym!(|app: App| -> Selection {
":select/scene" => app.selection().select_scene(app.tracks().len()), ":select/scene" => app.selection().select_scene(app.tracks().len()),
":select/scene/next" => app.selection().select_scene_next(app.scenes().len()), ":select/scene/next" => app.selection().select_scene_next(app.scenes().len()),
":select/scene/prev" => app.selection().select_scene_prev(), ":select/scene/prev" => app.selection().select_scene_prev(),
@ -634,14 +622,14 @@ dsl_sym_ns!(|app: App| -> Selection {
":select/track/next" => app.selection().select_track_next(app.tracks().len()), ":select/track/next" => app.selection().select_track_next(app.tracks().len()),
":select/track/prev" => app.selection().select_track_prev(), ":select/track/prev" => app.selection().select_track_prev(),
}); });
dsl_sym_ns!(|app: App| -> Option<u7> { dsl_sym!(|app: App| -> Option<u7> {
":editor/pitch" => Some((app.editor().as_ref().map(|e|e.get_note_pos()).unwrap() as u8).into()) ":editor/pitch" => Some((app.editor().as_ref().map(|e|e.get_note_pos()).unwrap() as u8).into())
}); });
dsl_sym_ns!(|app: App| -> Option<usize> { dsl_sym!(|app: App| -> Option<usize> {
":selected/scene" => app.selection().scene(), ":selected/scene" => app.selection().scene(),
":selected/track" => app.selection().track(), ":selected/track" => app.selection().track(),
}); });
dsl_sym_ns!(|app: App| -> Option<Arc<RwLock<MidiClip>>> { dsl_sym!(|app: App| -> Option<Arc<RwLock<MidiClip>>> {
":selected/clip" => if let Selection::TrackClip { track, scene } = app.selection() { ":selected/clip" => if let Selection::TrackClip { track, scene } = app.selection() {
app.scenes()[*scene].clips[*track].clone() app.scenes()[*scene].clips[*track].clone()
} else { } else {
@ -651,9 +639,9 @@ dsl_sym_ns!(|app: App| -> Option<Arc<RwLock<MidiClip>>> {
#[derive(Debug)] #[derive(Debug)]
pub enum AppCommand { pub enum AppCommand {
} }
dsl_exp_ns!(|app: App| -> AppCommand { dsl_exp!(|app: App| -> AppCommand {
("stop-all") => todo!(),//app.project.stop_all(), ("stop-all") => app.project.stop_all(),
("enqueue", clip: Option<Arc<RwLock<MidiClip>>>) => todo!(), ("enqueue", clip?: Option<Arc<RwLock<MidiClip>>>) => todo!(),
("history", delta: isize) => todo!(), ("history", delta: isize) => todo!(),
("zoom", zoom: usize) => todo!(), ("zoom", zoom: usize) => todo!(),
("select", selection: Selection) => todo!(), ("select", selection: Selection) => todo!(),
@ -664,12 +652,12 @@ dsl_exp_ns!(|app: App| -> AppCommand {
("pool" / command: PoolCommand) => todo!(), ("pool" / command: PoolCommand) => todo!(),
("pool" / editor: MidiEditCommand) => todo!(), ("pool" / editor: MidiEditCommand) => todo!(),
}); });
dsl_exp_ns!(|app: App| -> DialogCommand {}); dsl_exp!(|app: App| -> DialogCommand {});
dsl_exp_ns!(|app: App| -> ArrangementCommand {}); dsl_exp!(|app: App| -> ArrangementCommand {});
dsl_exp_ns!(|app: App| -> ClockCommand {}); dsl_exp!(|app: App| -> ClockCommand {});
dsl_exp_ns!(|app: App| -> SamplerCommand {}); dsl_exp!(|app: App| -> SamplerCommand {});
dsl_exp_ns!(|app: App| -> PoolCommand {}); dsl_exp!(|app: App| -> PoolCommand {});
dsl_exp_ns!(|app: App| -> MidiEditCommand {}); dsl_exp!(|app: App| -> MidiEditCommand {});
impl App { impl App {
pub fn focused_editor (&self) -> bool { pub fn focused_editor (&self) -> bool {
false false

2
crates/device/src/arranger/arranger_api.rs
View file

@ -96,7 +96,7 @@ impl ArrangementCommand {
let index = arranger.track_add(None, None, &[], &[])?.0; let index = arranger.track_add(None, None, &[], &[])?.0;
*arranger.selection_mut() = match arranger.selection() { *arranger.selection_mut() = match arranger.selection() {
Selection::Track(_) => Selection::Track(index), Selection::Track(_) => Selection::Track(index),
Selection::TrackClip { track: _, scene } => Selection::TrackClip { Selection::TrackClip { track, scene } => Selection::TrackClip {
track: index, scene: *scene track: index, scene: *scene
}, },
_ => *arranger.selection() _ => *arranger.selection()

6
crates/device/src/arranger/arranger_tracks.rs
View file

@ -336,7 +336,7 @@ pub(crate) fn io_ports <'a, T: PortsSizes<'a>> (
fg: Color, bg: Color, iter: impl Fn()->T + Send + Sync + 'a fg: Color, bg: Color, iter: impl Fn()->T + Send + Sync + 'a
) -> impl Content<TuiOut> + 'a { ) -> impl Content<TuiOut> + 'a {
Map::new(iter, move|( Map::new(iter, move|(
_index, name, connections, y, y2 index, name, connections, y, y2
): (usize, &'a Arc<str>, &'a [Connect], usize, usize), _| ): (usize, &'a Arc<str>, &'a [Connect], usize, usize), _|
map_south(y as u16, (y2-y) as u16, Bsp::s( map_south(y as u16, (y2-y) as u16, Bsp::s(
Fill::x(Tui::bold(true, Tui::fg_bg(fg, bg, Align::w(Bsp::e(" 󰣲 ", name))))), Fill::x(Tui::bold(true, Tui::fg_bg(fg, bg, Align::w(Bsp::e(" 󰣲 ", name))))),
@ -349,11 +349,11 @@ pub(crate) fn io_conns <'a, T: PortsSizes<'a>> (
fg: Color, bg: Color, iter: impl Fn()->T + Send + Sync + 'a fg: Color, bg: Color, iter: impl Fn()->T + Send + Sync + 'a
) -> impl Content<TuiOut> + 'a { ) -> impl Content<TuiOut> + 'a {
Map::new(iter, move|( Map::new(iter, move|(
_index, _name, connections, y, y2 index, name, connections, y, y2
): (usize, &'a Arc<str>, &'a [Connect], usize, usize), _| ): (usize, &'a Arc<str>, &'a [Connect], usize, usize), _|
map_south(y as u16, (y2-y) as u16, Bsp::s( map_south(y as u16, (y2-y) as u16, Bsp::s(
Fill::x(Tui::bold(true, wrap(bg, fg, Fill::x(Align::w("▞▞▞▞ ▞▞▞▞"))))), Fill::x(Tui::bold(true, wrap(bg, fg, Fill::x(Align::w("▞▞▞▞ ▞▞▞▞"))))),
Map::new(||connections.iter(), move|_conn, index|map_south(index as u16, 1, Map::new(||connections.iter(), move|connect, index|map_south(index as u16, 1,
Fill::x(Align::w(Tui::bold(false, wrap(bg, fg, Fill::x("")))))))))) Fill::x(Align::w(Tui::bold(false, wrap(bg, fg, Fill::x(""))))))))))
} }
//track_scroll: Fill::x(Fixed::y(1, ScrollbarH { //track_scroll: Fill::x(Fixed::y(1, ScrollbarH {

42
crates/device/src/arranger/arranger_view.rs
View file

@ -1,13 +1,18 @@
use crate::*; use crate::*;
impl Arrangement { impl Arrangement {
pub fn view_inputs <'a> (&'a self, _theme: ItemTheme) -> impl Content<TuiOut> + 'a { pub fn view_inputs <'a> (&'a self, theme: ItemTheme) -> impl Content<TuiOut> + 'a {
let mut h = 1u16;
for track in self.tracks().iter() {
h = h.max(self.midi_ins.len() as u16);
}
let h = h + 1;
Stack::south(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{ Stack::south(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
add(&Fixed::y(1, add(&Fixed::y(1,
Bsp::e(Fixed::x(20, Align::w(button_3("i", "nput ", format!("{}", self.midi_ins.len()), false))), Bsp::e(Fixed::x(20, Align::w(button_3("i", "nput ", format!("{}", self.midi_ins.len()), false))),
Bsp::w(Fixed::x(4, button_2("I", "+", false)), Bsp::w(Fixed::x(4, button_2("I", "+", false)),
Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{ Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (_index, track, _x1, _x2) in self.tracks_with_sizes() { for (index, track, x1, x2) in self.tracks_with_sizes() {
add(&Tui::bg(track.color.dark.rgb, Align::w(Fixed::x(track.width as u16, row!( add(&Tui::bg(track.color.dark.rgb, Align::w(Fixed::x(track.width as u16, row!(
Either(track.sequencer.monitoring, Tui::fg(Green, "mon "), "mon "), Either(track.sequencer.monitoring, Tui::fg(Green, "mon "), "mon "),
Either(track.sequencer.recording, Tui::fg(Red, "rec "), "rec "), Either(track.sequencer.recording, Tui::fg(Red, "rec "), "rec "),
@ -15,13 +20,13 @@ impl Arrangement {
))))) )))))
} }
}))))); })))));
for (_index, port) in self.midi_ins().iter().enumerate() { for (index, port) in self.midi_ins().iter().enumerate() {
add(&Fixed::y(1, Bsp::e( add(&Fixed::y(1, Bsp::e(
Fixed::x(20, Align::w(Bsp::e(" ● ", Fixed::x(20, Align::w(Bsp::e(" ● ",
Tui::bold(true, Tui::fg(Rgb(255,255,255), port.port_name()))))), Tui::bold(true, Tui::fg(Rgb(255,255,255), port.port_name()))))),
Bsp::w(Fixed::x(4, ()), Bsp::w(Fixed::x(4, ()),
Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{ Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (_index, track, _x1, _x2) in self.tracks_with_sizes() { for (index, track, x1, x2) in self.tracks_with_sizes() {
add(&Tui::bg(track.color.darker.rgb, Align::w(Fixed::x(track.width as u16, row!( add(&Tui::bg(track.color.darker.rgb, Align::w(Fixed::x(track.width as u16, row!(
Either(track.sequencer.monitoring, Tui::fg(Green, " ● "), " · "), Either(track.sequencer.monitoring, Tui::fg(Green, " ● "), " · "),
Either(track.sequencer.recording, Tui::fg(Red, " ● "), " · "), Either(track.sequencer.recording, Tui::fg(Red, " ● "), " · "),
@ -41,7 +46,7 @@ impl Arrangement {
let list = Bsp::s( let list = Bsp::s(
Fixed::y(1, Fill::x(Align::w(button_3("o", "utput", format!("{}", self.midi_outs.len()), false)))), Fixed::y(1, Fill::x(Align::w(button_3("o", "utput", format!("{}", self.midi_outs.len()), false)))),
Fixed::y(h - 1, Fill::xy(Align::nw(Stack::south(|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{ Fixed::y(h - 1, Fill::xy(Align::nw(Stack::south(|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (_index, port) in self.midi_outs().iter().enumerate() { for (index, port) in self.midi_outs().iter().enumerate() {
add(&Fixed::y(1,Fill::x(Bsp::e( add(&Fixed::y(1,Fill::x(Bsp::e(
Align::w(Bsp::e(" ● ", Tui::fg(Rgb(255,255,255),Tui::bold(true, port.port_name())))), Align::w(Bsp::e(" ● ", Tui::fg(Rgb(255,255,255),Tui::bold(true, port.port_name())))),
Fill::x(Align::e(format!("{}/{} ", Fill::x(Align::e(format!("{}/{} ",
@ -55,19 +60,20 @@ impl Arrangement {
Fixed::y(h, self.view_track_row_section(theme, list, button_2("O", "+", false), Fixed::y(h, self.view_track_row_section(theme, list, button_2("O", "+", false),
Tui::bg(theme.darker.rgb, Align::w(Fill::x( Tui::bg(theme.darker.rgb, Align::w(Fill::x(
Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{ Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (index, track, _x1, _x2) in self.tracks_with_sizes() { for (index, track, x1, x2) in self.tracks_with_sizes() {
add(&Fixed::x(self.track_width(index, track), add(&Fixed::x(self.track_width(index, track),
Stack::south(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{ Stack::south(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
let index = 0;
add(&Fixed::y(1, Align::w(Bsp::e( add(&Fixed::y(1, Align::w(Bsp::e(
Either(true, Tui::fg(Green, "play "), "play "), Either(true, Tui::fg(Green, "play "), "play "),
Either(false, Tui::fg(Yellow, "solo "), "solo "), Either(false, Tui::fg(Yellow, "solo "), "solo "),
)))); ))));
for (_index, port) in self.midi_outs().iter().enumerate() { for (index, port) in self.midi_outs().iter().enumerate() {
add(&Fixed::y(1, Align::w(Bsp::e( add(&Fixed::y(1, Align::w(Bsp::e(
Either(true, Tui::fg(Green, " ● "), " · "), Either(true, Tui::fg(Green, " ● "), " · "),
Either(false, Tui::fg(Yellow, " ● "), " · "), Either(false, Tui::fg(Yellow, " ● "), " · "),
)))); ))));
for (_index, _conn) in port.connections.iter().enumerate() { for (index, conn) in port.connections.iter().enumerate() {
add(&Fixed::y(1, Fill::x(""))); add(&Fixed::y(1, Fill::x("")));
} }
}})))}})))))) }})))}}))))))
@ -82,10 +88,10 @@ impl Arrangement {
button_3("d", "evice", format!("{}", self.track().map(|t|t.devices.len()).unwrap_or(0)), false), button_3("d", "evice", format!("{}", self.track().map(|t|t.devices.len()).unwrap_or(0)), false),
button_2("D", "+", false), button_2("D", "+", false),
Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{ Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (index, track, _x1, _x2) in self.tracks_with_sizes() { for (index, track, x1, x2) in self.tracks_with_sizes() {
add(&Fixed::xy(self.track_width(index, track), h + 1, add(&Fixed::xy(self.track_width(index, track), h + 1,
Tui::bg(track.color.dark.rgb, Align::nw(Map::south(2, move||0..h, Tui::bg(track.color.dark.rgb, Align::nw(Map::south(2, move||0..h,
|_, _index|Fixed::xy(track.width as u16, 2, |_, index|Fixed::xy(track.width as u16, 2,
Tui::fg_bg( Tui::fg_bg(
ItemTheme::G[32].lightest.rgb, ItemTheme::G[32].lightest.rgb,
ItemTheme::G[32].dark.rgb, ItemTheme::G[32].dark.rgb,
@ -121,8 +127,8 @@ pub trait TracksView:
} }
/// Iterate over tracks with their corresponding sizes. /// Iterate over tracks with their corresponding sizes.
fn tracks_with_sizes (&self) -> impl TracksSizes<'_> { fn tracks_with_sizes (&self) -> impl TracksSizes<'_> {
let _editor_width = self.editor().map(|e|e.width()); let editor_width = self.editor().map(|e|e.width());
let _active_track = self.selection().track(); let active_track = self.selection().track();
let mut x = 0; let mut x = 0;
self.tracks().iter().enumerate().map_while(move |(index, track)|{ self.tracks().iter().enumerate().map_while(move |(index, track)|{
let width = track.width.max(8); let width = track.width.max(8);
@ -137,7 +143,7 @@ pub trait TracksView:
} }
fn view_track_row_section <'a> ( fn view_track_row_section <'a> (
&'a self, &'a self,
_theme: ItemTheme, theme: ItemTheme,
button: impl Content<TuiOut>, button: impl Content<TuiOut>,
button_add: impl Content<TuiOut>, button_add: impl Content<TuiOut>,
content: impl Content<TuiOut> content: impl Content<TuiOut>
@ -171,7 +177,7 @@ pub trait TracksView:
), ),
Tui::bg(theme.darker.rgb, Fixed::y(2, Fill::x( Tui::bg(theme.darker.rgb, Fixed::y(2, Fill::x(
Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{ Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (index, track, _x1, _x2) in self.tracks_with_sizes() { for (index, track, x1, x2) in self.tracks_with_sizes() {
add(&Fixed::x(self.track_width(index, track), add(&Fixed::x(self.track_width(index, track),
Tui::bg(if self.selection().track() == Some(index) { Tui::bg(if self.selection().track() == Some(index) {
track.color.light.rgb track.color.light.rgb
@ -184,7 +190,7 @@ pub trait TracksView:
} }
}))))) })))))
} }
fn view_track_outputs <'a> (&'a self, theme: ItemTheme, _h: u16) -> impl Content<TuiOut> { fn view_track_outputs <'a> (&'a self, theme: ItemTheme, h: u16) -> impl Content<TuiOut> {
self.view_track_row_section(theme, self.view_track_row_section(theme,
Bsp::s( Bsp::s(
Fill::x(Align::w(button_2("o", "utput", false))), Fill::x(Align::w(button_2("o", "utput", false))),
@ -196,7 +202,7 @@ pub trait TracksView:
button_2("O", "+", false), button_2("O", "+", false),
Tui::bg(theme.darker.rgb, Align::w(Fill::x( Tui::bg(theme.darker.rgb, Align::w(Fill::x(
Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{ Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (index, track, _x1, _x2) in self.tracks_with_sizes() { for (index, track, x1, x2) in self.tracks_with_sizes() {
add(&Fixed::x(self.track_width(index, track), add(&Fixed::x(self.track_width(index, track),
Align::nw(Fill::y(Map::south(1, ||track.sequencer.midi_outs.iter(), Align::nw(Fill::y(Map::south(1, ||track.sequencer.midi_outs.iter(),
|port, index|Tui::fg(Rgb(255, 255, 255), |port, index|Tui::fg(Rgb(255, 255, 255),
@ -216,7 +222,7 @@ pub trait TracksView:
button_2("I", "+", false), button_2("I", "+", false),
Tui::bg(theme.darker.rgb, Align::w(Fill::x( Tui::bg(theme.darker.rgb, Align::w(Fill::x(
Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{ Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
for (index, track, _x1, _x2) in self.tracks_with_sizes() { for (index, track, x1, x2) in self.tracks_with_sizes() {
add(&Fixed::xy(self.track_width(index, track), h + 1, add(&Fixed::xy(self.track_width(index, track), h + 1,
Align::nw(Bsp::s( Align::nw(Bsp::s(
Tui::bg(track.color.base.rgb, Tui::bg(track.color.base.rgb,
@ -275,7 +281,7 @@ pub trait ScenesView:
})) }))
} }
fn view_scene_name (&self, index: usize, scene: &Scene) -> impl Content<TuiOut> { fn view_scene_name (&self, index: usize, scene: &Scene) -> impl Content<TuiOut> {
let h = if self.selection().scene() == Some(index) && let Some(_editor) = self.editor() { let h = if self.selection().scene() == Some(index) && let Some(editor) = self.editor() {
7 7
} else { } else {
Self::H_SCENE as u16 Self::H_SCENE as u16

2
crates/device/src/browser.rs
View file

@ -1,3 +1,3 @@
mod browser_api; pub use self::browser_api::*; mod browser_api; pub use self::browser_api::*;
mod browser_model; pub use self::browser_model::*; mod browser_model; pub use self::browser_model::*;
mod browser_view; //pub use self::browser_view::*; mod browser_view; pub use self::browser_view::*;

2
crates/device/src/browser/browser_view.rs
View file

@ -5,7 +5,7 @@ content!(TuiOut: |self: Browser|Map::south(1, ||EntriesIterator {
index: 0, index: 0,
length: self.dirs.len() + self.files.len(), length: self.dirs.len() + self.files.len(),
browser: self, browser: self,
}, |entry, _index|Fill::x(Align::w(entry)))); }, |entry, index|Fill::x(Align::w(entry))));
struct EntriesIterator<'a> { struct EntriesIterator<'a> {
browser: &'a Browser, browser: &'a Browser,

4
crates/device/src/editor/editor_view.rs
View file

@ -9,7 +9,7 @@ content!(TuiOut: |self: MidiEditor| {
impl MidiEditor { impl MidiEditor {
pub fn clip_status (&self) -> impl Content<TuiOut> + '_ { pub fn clip_status (&self) -> impl Content<TuiOut> + '_ {
let (_color, name, length, looped) = if let Some(clip) = self.clip().as_ref().map(|p|p.read().unwrap()) { let (color, name, length, looped) = if let Some(clip) = self.clip().as_ref().map(|p|p.read().unwrap()) {
(clip.color, clip.name.clone(), clip.length, clip.looped) (clip.color, clip.name.clone(), clip.length, clip.looped)
} else { (ItemTheme::G[64], String::new().into(), 0, false) }; } else { (ItemTheme::G[64], String::new().into(), 0, false) };
Fixed::x(20, col!( Fixed::x(20, col!(
@ -26,7 +26,7 @@ impl MidiEditor {
} }
pub fn edit_status (&self) -> impl Content<TuiOut> + '_ { pub fn edit_status (&self) -> impl Content<TuiOut> + '_ {
let (_color, length) = if let Some(clip) = self.clip().as_ref().map(|p|p.read().unwrap()) { let (color, length) = if let Some(clip) = self.clip().as_ref().map(|p|p.read().unwrap()) {
(clip.color, clip.length) (clip.color, clip.length)
} else { (ItemTheme::G[64], 0) }; } else { (ItemTheme::G[64], 0) };
let time_pos = self.get_time_pos(); let time_pos = self.get_time_pos();

4
crates/device/src/lib.rs
View file

@ -14,10 +14,10 @@ pub(crate) use std::error::Error;
pub(crate) use std::ffi::OsString; pub(crate) use std::ffi::OsString;
pub(crate) use ::tengri::{from, has, maybe_has, Usually, Perhaps, Has, MaybeHas}; pub(crate) use ::tengri::{from, has, maybe_has, Usually, Perhaps, Has, MaybeHas};
pub(crate) use ::tengri::{dsl::*, input::*, output::*, tui::{*, ratatui::prelude::*}}; pub(crate) use ::tengri::{dsl::*, input::*, output::{*, Margin}, tui::{*, ratatui::prelude::*}};
pub(crate) use ::tek_engine::*; pub(crate) use ::tek_engine::*;
pub(crate) use ::tek_engine::midi::{u7, LiveEvent, MidiMessage}; pub(crate) use ::tek_engine::midi::{u7, LiveEvent, MidiMessage};
pub(crate) use ::tek_engine::jack::{Control, ProcessScope, RawMidi}; pub(crate) use ::tek_engine::jack::{Control, ProcessScope, MidiWriter, RawMidi};
pub(crate) use ratatui::{prelude::Rect, widgets::{Widget, canvas::{Canvas, Line}}}; pub(crate) use ratatui::{prelude::Rect, widgets::{Widget, canvas::{Canvas, Line}}};
pub(crate) use Color::*; pub(crate) use Color::*;

2
crates/device/src/pool/pool_model.rs
View file

@ -18,7 +18,7 @@ pub struct Pool {
//.flatten())); //.flatten()));
impl Default for Pool { impl Default for Pool {
fn default () -> Self { fn default () -> Self {
//use PoolMode::*; use PoolMode::*;
Self { Self {
visible: true, visible: true,
clips: Arc::from(RwLock::from(vec![])), clips: Arc::from(RwLock::from(vec![])),

2
crates/device/src/pool/pool_view.rs
View file

@ -7,7 +7,7 @@ content!(TuiOut: |self: PoolView<'a>| {
//let color = self.1.clip().map(|c|c.read().unwrap().color).unwrap_or_else(||Tui::g(32).into()); //let color = self.1.clip().map(|c|c.read().unwrap().color).unwrap_or_else(||Tui::g(32).into());
//let on_bg = |x|x;//Bsp::b(Repeat(" "), Tui::bg(color.darkest.rgb, x)); //let on_bg = |x|x;//Bsp::b(Repeat(" "), Tui::bg(color.darkest.rgb, x));
//let border = |x|x;//Outer(Style::default().fg(color.dark.rgb).bg(color.darkest.rgb)).enclose(x); //let border = |x|x;//Outer(Style::default().fg(color.dark.rgb).bg(color.darkest.rgb)).enclose(x);
//let height = pool.clips.read().unwrap().len() as u16; let height = pool.clips.read().unwrap().len() as u16;
Fixed::x(20, Fill::y(Align::n(Map::new( Fixed::x(20, Fill::y(Align::n(Map::new(
||pool.clips().clone().into_iter(), ||pool.clips().clone().into_iter(),
move|clip: Arc<RwLock<MidiClip>>, i: usize|{ move|clip: Arc<RwLock<MidiClip>>, i: usize|{

2
crates/device/src/port/port_midi_in.rs
View file

@ -84,7 +84,7 @@ pub trait HasMidiIns {
.collect::<Vec<_>>() .collect::<Vec<_>>()
} }
fn midi_ins_with_sizes <'a> (&'a self) -> fn midi_ins_with_sizes <'a> (&'a self) ->
impl Iterator<Item=(usize, &'a Arc<str>, &'a [Connect], usize, usize)> + Send + Sync + 'a impl Iterator<Item=(usize, &Arc<str>, &[Connect], usize, usize)> + Send + Sync + 'a
{ {
let mut y = 0; let mut y = 0;
self.midi_ins().iter().enumerate().map(move|(i, input)|{ self.midi_ins().iter().enumerate().map(move|(i, input)|{

2
crates/device/src/port/port_midi_out.rs
View file

@ -119,7 +119,7 @@ pub trait HasMidiOuts {
fn midi_outs (&self) -> &Vec<MidiOutput>; fn midi_outs (&self) -> &Vec<MidiOutput>;
fn midi_outs_mut (&mut self) -> &mut Vec<MidiOutput>; fn midi_outs_mut (&mut self) -> &mut Vec<MidiOutput>;
fn midi_outs_with_sizes <'a> (&'a self) -> fn midi_outs_with_sizes <'a> (&'a self) ->
impl Iterator<Item=(usize, &'a Arc<str>, &'a [Connect], usize, usize)> + Send + Sync + 'a impl Iterator<Item=(usize, &Arc<str>, &[Connect], usize, usize)> + Send + Sync + 'a
{ {
let mut y = 0; let mut y = 0;
self.midi_outs().iter().enumerate().map(move|(i, output)|{ self.midi_outs().iter().enumerate().map(move|(i, output)|{

8
crates/device/src/sampler/sampler_view.rs
View file

@ -7,8 +7,8 @@ impl Sampler {
let cells_y = 8u16; let cells_y = 8u16;
let cell_width = 10u16; let cell_width = 10u16;
let cell_height = 2u16; let cell_height = 2u16;
//let width = cells_x * cell_width; let width = cells_x * cell_width;
//let height = cells_y * cell_height; let height = cells_y * cell_height;
let cols = Map::east( let cols = Map::east(
cell_width, cell_width,
move||0..cells_x, move||0..cells_x,
@ -205,8 +205,8 @@ fn draw_viewer (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> +
Canvas::default() Canvas::default()
.x_bounds([0.0, width as f64]) .x_bounds([0.0, width as f64])
.y_bounds([0.0, height as f64]) .y_bounds([0.0, height as f64])
.paint(|_ctx| { .paint(|ctx| {
//let text = "press record to begin sampling"; let text = "press record to begin sampling";
//ctx.print( //ctx.print(
//(width - text.len() as u16) as f64 / 2.0, //(width - text.len() as u16) as f64 / 2.0,
//height as f64 / 2.0, //height as f64 / 2.0,

4
crates/engine/src/lib.rs
View file

@ -88,10 +88,12 @@ mod time; pub use self::time::*;
mod note; pub use self::note::*; mod note; pub use self::note::*;
pub mod jack; pub use self::jack::*; pub mod jack; pub use self::jack::*;
pub mod midi; pub use self::midi::*; pub mod midi; pub use self::midi::*;
pub(crate) use std::sync::{Arc, RwLock, atomic::{AtomicUsize, AtomicBool, Ordering::Relaxed}}; pub(crate) use std::sync::{Arc, RwLock, atomic::{AtomicUsize, AtomicBool, Ordering::Relaxed}};
pub(crate) use std::fmt::Debug; pub(crate) use std::fmt::Debug;
pub(crate) use std::ops::{Add, Sub, Mul, Div, Rem}; pub(crate) use std::ops::{Add, Sub, Mul, Div, Rem};
pub(crate) use ::tengri::{from, Usually};
pub(crate) use ::tengri::{from, Usually, tui::*, dsl::*};
pub use ::atomic_float; pub(crate) use atomic_float::*; pub use ::atomic_float; pub(crate) use atomic_float::*;

2
crates/engine/src/midi.rs
View file

@ -1,3 +1,5 @@
use crate::*;
pub use ::midly::{ pub use ::midly::{
Smf, Smf,
TrackEventKind, TrackEventKind,

2
deps/tengri vendored

@ -1 +1 @@
Subproject commit d7884f6289ac6c7a88f806f4453fb7c246c87f0b Subproject commit a1190a24a1bdea774cedf86fff7b7e407c0a4cc7