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

euphuckingwrecka

Browse source
This commit is contained in:
🪞👃🪞 2025-05-18 18:54:30 +03:00
parent 3e9545fe26
commit 7746abc9ee
5 changed files with 92 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

18
config/config_arranger.edn
View file

@ -4,6 +4,7 @@
(keys
(layer-if :focus-editor "./keys_editor.edn")
(layer-if :focus-dialog "./keys_dialog.edn")
(layer-if :focus-message "./keys_message.edn")
(layer-if :focus-device-add "./keys_device_add.edn")
(layer-if :focus-browser "./keys_browser.edn")
@ -21,11 +22,12 @@
(bsp/a :view-dialog
(bsp/w :view-meters-output
(bsp/e :view-meters-input
(bsp/n (fixed/y 2 :view-status-h2)
(bsp/n :view-tracks-inputs
(bsp/s :view-tracks-devices
(bsp/s :view-tracks-outputs
(bsp/s :view-tracks-names
(fill/xy (either :focus-editor
(bsp/e :view-scenes-names :view-editor)
:view-scenes)))))))))))
(bsp/n :view-history
(bsp/n (fixed/y 2 :view-status-h2)
(bsp/n :view-tracks-inputs
(bsp/s :view-tracks-devices
(bsp/s :view-tracks-outputs
(bsp/s :view-tracks-names
(fill/xy (either :focus-editor
(bsp/e :view-scenes-names :view-editor)
:view-scenes))))))))))))

0
config/keys_dialog.edn Normal file
View file

130
crates/app/src/api.rs
View file

@ -4,27 +4,69 @@ 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 }}; }
handle!(TuiIn: |self: App, input|Ok(if let Some(command) = self.config.keys.command(self, input) {
// FIXME failed commands not persisted in undo history
let undo = command.clone().execute(self)?;
self.history.push((command, undo));
Some(true)
} else {
None
}));
handle!(TuiIn: |self: App, input|self.handle_tui_key_with_history(input));
impl App {
fn handle_tui_key_with_history (&mut self, input: &TuiIn) -> Perhaps<bool> {
Ok(if let Some(command) = self.config.keys.command(self, input) {
// FIXME failed commands not persisted in undo history
let undo = command.clone().execute(self)?;
self.history.push((command, undo));
Some(true)
} else {
None
})
}
}
#[tengri_proc::command(App)]
impl AppCommand {
fn cancel_dialog (app: &mut App) -> Perhaps<Self> {
app.toggle_dialog(None);
Ok(None)
}
fn toggle_editor (app: &mut App, value: bool) -> Perhaps<Self> {
app.toggle_editor(Some(value));
Ok(None)
}
//fn color (app: &mut App, theme: ItemTheme) -> Perhaps<Self> {
//Ok(app.set_color(Some(theme)).map(|theme|Self::Color{theme}))
//}
fn editor (app: &mut App, command: MidiEditCommand) -> Perhaps<Self> {
Ok(if let Some(editor) = app.editor_mut() {
let undo = command.clone().delegate(editor, |command|AppCommand::Editor{command})?;
// update linked sampler after editor action
app.project.sampler_mut().map(|sampler|match command {
// autoselect: automatically select sample in sampler
MidiEditCommand::SetNotePos { pos } => { sampler.set_note_pos(pos); },
_ => {}
});
undo
} else {
None
})
}
fn dialog (app: &mut App, command: DialogCommand) -> Perhaps<Self> {
Ok(command.delegate(&mut app.dialog, |command|Self::Dialog{command})?)
}
fn project (app: &mut App, command: ArrangementCommand) -> Perhaps<Self> {
Ok(command.delegate(&mut app.project, |command|Self::Project{command})?)
}
fn clock (app: &mut App, command: ClockCommand) -> Perhaps<Self> {
Ok(command.execute(app.clock_mut())?.map(|command|Self::Clock{command}))
}
fn sampler (app: &mut App, command: SamplerCommand) -> Perhaps<Self> {
Ok(app.project.sampler_mut()
.map(|s|command.delegate(s, |command|Self::Sampler{command}))
.transpose()?
.flatten())
}
fn pool (app: &mut App, command: PoolCommand) -> Perhaps<Self> {
let undo = command.clone().delegate(&mut app.pool, |command|AppCommand::Pool{command})?;
// update linked editor after pool action
match command {
// autoselect: automatically load selected clip in editor
PoolCommand::Select { .. } |
// autocolor: update color in all places simultaneously
PoolCommand::Clip { command: PoolClipCommand::SetColor { .. } } => {
let clip = app.pool.clip().clone();
app.editor_mut().map(|editor|editor.set_clip(clip.as_ref()))
},
_ => None
};
Ok(undo)
}
fn enqueue (app: &mut App, clip: Option<Arc<RwLock<MidiClip>>>) -> Perhaps<Self> {
todo!()
}
@ -34,10 +76,6 @@ impl AppCommand {
fn zoom (app: &mut App, zoom: usize) -> Perhaps<Self> {
todo!()
}
//fn launch (app: &mut App) -> Perhaps<Self> {
//app.project.launch();
//Ok(None)
//}
fn select (app: &mut App, selection: Selection) -> Perhaps<Self> {
*app.project.selection_mut() = selection;
//todo!
@ -65,53 +103,13 @@ impl AppCommand {
app.tracks_stop_all();
Ok(None)
}
fn dialog (app: &mut App, command: DialogCommand) -> Perhaps<Self> {
Ok(command.delegate(&mut app.dialog, |command|Self::Dialog{command})?)
}
fn project (app: &mut App, command: ArrangementCommand) -> Perhaps<Self> {
Ok(command.delegate(&mut app.project, |command|Self::Project{command})?)
}
fn clock (app: &mut App, command: ClockCommand) -> Perhaps<Self> {
Ok(command.execute(app.clock_mut())?.map(|command|Self::Clock{command}))
}
fn editor (app: &mut App, command: MidiEditCommand) -> Perhaps<Self> {
Ok(if let Some(editor) = app.editor_mut() {
let undo = command.clone().delegate(editor, |command|AppCommand::Editor{command})?;
// update linked sampler after editor action
app.project.sampler_mut().map(|sampler|match command {
// autoselect: automatically select sample in sampler
MidiEditCommand::SetNotePos { pos } => { sampler.set_note_pos(pos); },
_ => {}
});
undo
} else {
None
})
}
fn sampler (app: &mut App, command: SamplerCommand) -> Perhaps<Self> {
Ok(app.project.sampler_mut()
.map(|s|command.delegate(s, |command|Self::Sampler{command}))
.transpose()?
.flatten())
}
fn pool (app: &mut App, command: PoolCommand) -> Perhaps<Self> {
let undo = command.clone().delegate(
&mut app.pool,
|command|AppCommand::Pool{command}
)?;
// update linked editor after pool action
match command {
// autoselect: automatically load selected clip in editor
PoolCommand::Select { .. } |
// autocolor: update color in all places simultaneously
PoolCommand::Clip { command: PoolClipCommand::SetColor { .. } } => {
let clip = app.pool.clip().clone();
app.editor_mut().map(|editor|editor.set_clip(clip.as_ref()))
},
_ => None
};
Ok(undo)
}
//fn color (app: &mut App, theme: ItemTheme) -> Perhaps<Self> {
//Ok(app.set_color(Some(theme)).map(|theme|Self::Color{theme}))
//}
//fn launch (app: &mut App) -> Perhaps<Self> {
//app.project.launch();
//Ok(None)
//}
}
impl<'state> Context<'state, ClockCommand> for App {
fn get <'source> (&'state self, iter: &mut TokenIter<'source>) -> Option<ClockCommand> {

15
crates/app/src/model.rs
View file

@ -179,6 +179,9 @@ impl App {
fn focus_editor (&self) -> bool {
self.project.editor.is_some()
}
fn focus_dialog (&self) -> bool {
self.dialog.is_some()
}
fn focus_message (&self) -> bool {
matches!(self.dialog, Some(Dialog::Message(..)))
}
@ -451,13 +454,11 @@ impl Configuration {
let cond = cond.unwrap();
println!("ok");
map.add_layer_if(
Box::new(move |state|{
let mut exp = exp.clone();
let value = Context::get(state, &mut format!(":{cond}").as_str().into()).unwrap_or(false);
if value {
panic!("layer-if cond={cond:?} exp={exp:?} value={value:?}");
}
value
Box::new(move |state: &App|{
Context::get(state,
&mut format!("{cond}").as_str().into())
.unwrap_or_else(||panic!(
"missing input layer conditional {cond} from {exp:?}"))
}),
keys
);

15
crates/app/src/view.rs
View file

@ -7,6 +7,11 @@ impl App {
pub fn view_nil (&self) -> impl Content<TuiOut> + use<'_> {
"nil"
}
pub fn view_history (&self) -> impl Content<TuiOut> {
Fill::x(Align::w(self.history.last()
.map(|last|FieldH(self.color, format!("History ({})", self.history.len()),
Fill::x(Align::w(format!("{:?}", last.0)))))));
}
pub fn view_status_h2 (&self) -> impl Content<TuiOut> + use<'_> {
self.update_clock();
let theme = self.color;
@ -24,25 +29,25 @@ impl App {
)
)
)));
add(&" ");
{
let cache = self.view_cache.read().unwrap();
add(&Fixed::x(16, Align::w(Bsp::s(
add(&Fixed::x(13, Align::w(Bsp::s(
FieldH(theme, "Beat", cache.beat.view.clone()),
FieldH(theme, "Time", cache.time.view.clone()),
))));
add(&Fixed::x(16, Align::w(Bsp::s(
add(&Fixed::x(13, Align::w(Bsp::s(
Fill::x(Align::w(FieldH(theme, "BPM", cache.bpm.view.clone()))),
Fill::x(Align::w(FieldH(theme, "SR ", cache.sr.view.clone()))),
))));
add(&Fixed::x(16, Align::w(Bsp::s(
add(&Fixed::x(13, Align::w(Bsp::s(
Fill::x(Align::w(FieldH(theme, "Buf", cache.buf.view.clone()))),
Fill::x(Align::w(FieldH(theme, "Lat", cache.lat.view.clone()))),
))));
add(&FieldV(theme, "Selection", Fill::x(Align::w(self.selection().describe(
add(&Fixed::x(16, FieldV(theme, "Selection", Align::w(self.selection().describe(
self.tracks(),
self.scenes()
)))));
add(&FieldV(theme, "History", Fill::x(Align::w(format!("{}", self.history.len())))));
}
}))
}