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

wip: bringing it back from the dead once again
Some checks failed
/ build (push) Has been cancelled
Details

Browse source
This commit is contained in:
🪞👃🪞 2025-07-14 23:06:41 +03:00
parent 45dc05acd6
commit 00cd8064c5
5 changed files with 71 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

37
config/config_arranger.edn
View file

@ -1,23 +1,22 @@
(name "Arranger") (name
"Arranger")
(info "A session grid.") (info
"A grid of launchable clips arranged by track and scene.")
(keys (keys
(layer-if :focus-editor "./keys_editor.edn") (cond :focus-editor (load "./keys_editor.edn"))
(layer-if :focus-dialog "./keys_dialog.edn") (cond :focus-dialog (load "./keys_dialog.edn"))
(layer-if :focus-message "./keys_message.edn") (cond :focus-message (load "./keys_message.edn"))
(layer-if :focus-device-add "./keys_device_add.edn") (cond :focus-device-add (load "./keys_device_add.edn"))
(layer-if :focus-browser "./keys_browser.edn") (cond :focus-browser (load "./keys_browser.edn"))
(layer-if :focus-pool-rename "./keys_rename.edn") (cond :focus-pool-rename (load "./keys_rename.edn"))
(layer-if :focus-pool-length "./keys_length.edn") (cond :focus-pool-length (load "./keys_length.edn"))
(layer-if :focus-clip "./keys_clip.edn") (cond :focus-clip (load "./keys_clip.edn"))
(layer-if :focus-track "./keys_track.edn") (cond :focus-track (load "./keys_track.edn"))
(layer-if :focus-scene "./keys_scene.edn") (cond :focus-scene (load "./keys_scene.edn"))
(layer-if :focus-mix "./keys_mix.edn") (cond :focus-mix (load "./keys_mix.edn"))
(layer "./keys_clock.edn") (load "./keys_clock.edn")
(layer "./keys_arranger.edn") (load "./keys_arranger.edn")
(layer "./keys_global.edn")) (load "./keys_global.edn"))
(view (view
(bsp/a :view-dialog (bsp/a :view-dialog
(bsp/w :view-meters-output (bsp/w :view-meters-output

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

@ -42,12 +42,12 @@ maybe_has!(Scene: |self: App|
impl HasSceneScroll for App { fn scene_scroll (&self) -> usize { self.project.scene_scroll() } } impl HasSceneScroll for App { fn scene_scroll (&self) -> usize { self.project.scene_scroll() } }
has_clips!(|self: App|self.pool.clips); has_clips!(|self: App|self.pool.clips);
impl HasClipsSize for App { fn clips_size (&self) -> &Measure<TuiOut> { &self.project.inner_size } } impl HasClipsSize for App { fn clips_size (&self) -> &Measure<TuiOut> { &self.project.inner_size } }
take!(ClockCommand |state: App, iter|Take::take(state.clock(), iter)); //take!(ClockCommand |state: App, iter|Take::take(state.clock(), iter));
take!(MidiEditCommand |state: App, iter|Ok(state.editor().map(|x|Take::take(x, iter)).transpose()?.flatten())); //take!(MidiEditCommand |state: App, iter|Ok(state.editor().map(|x|Take::take(x, iter)).transpose()?.flatten()));
take!(PoolCommand |state: App, iter|Take::take(&state.pool, iter)); //take!(PoolCommand |state: App, iter|Take::take(&state.pool, iter));
take!(SamplerCommand |state: App, iter|Ok(state.project.sampler().map(|x|Take::take(x, iter)).transpose()?.flatten())); //take!(SamplerCommand |state: App, iter|Ok(state.project.sampler().map(|x|Take::take(x, iter)).transpose()?.flatten()));
take!(ArrangementCommand |state: App, iter|Take::take(&state.project, iter)); //take!(ArrangementCommand |state: App, iter|Take::take(&state.project, iter));
take!(DialogCommand |state: App, iter|Take::take(&state.dialog, iter)); //take!(DialogCommand |state: App, iter|Take::take(&state.dialog, iter));
//has_editor!(|self: App|{ //has_editor!(|self: App|{
//editor = self.editor; //editor = self.editor;
//editor_w = { //editor_w = {
@ -327,36 +327,36 @@ pub struct Configuration {
/// Description of configuration /// Description of configuration
pub info: Option<Arc<str>>, pub info: Option<Arc<str>>,
/// View definition /// View definition
pub view: Cst, pub view: Ast,
// Input keymap // Input keymap
pub keys: InputMap<App, AppCommand, TuiIn, Cst>, pub keys: InputMap<TuiIn, Ast>,
} }
impl Configuration { impl Configuration {
pub fn new (path: &impl AsRef<Path>, _watch: bool) -> Usually<Self> { pub fn new (path: &impl AsRef<Path>, _watch: bool) -> Usually<Self> {
let text = read_and_leak(path.as_ref())?; let text = read_and_leak(path.as_ref())?;
let [name, info, view, keys] = Self::parse(Cst::from(text))?; let [name, info, view, keys] = Self::parse(Ast::from(text))?;
Ok(Self { Ok(Self {
path: path.as_ref().into(), path: path.as_ref().into(),
info: info.map(Self::parse_info).flatten(), info: info.map(Self::parse_info).flatten(),
name: name.map(Self::parse_name).flatten(), name: name.map(Self::parse_name).flatten(),
view: Self::parse_view(view)?, view: Self::parse_view(view)?.into(),
keys: Self::parse_keys(&path, keys)?, keys: Self::parse_keys(&path, keys)?.into(),
}) })
} }
fn parse (iter: Cst) -> Usually<[Option<Cst>;4]> { fn parse <T: Dsl> (iter: T) -> Usually<[Option<T>;4]> {
let mut name: Option<Cst> = None; let mut name: Option<T> = None;
let mut info: Option<Cst> = None; let mut info: Option<T> = None;
let mut view: Option<Cst> = None; let mut view: Option<T> = None;
let mut keys: Option<Cst> = None; let mut keys: Option<T> = None;
for token in iter { for token in iter {
match token.value { match token.value {
Value::Exp(_, mut exp) => { DslVal::Exp(_, mut exp) => {
let next = exp.next(); let next = exp.next();
match next { match next.val() {
Some(Token { value: Value::Key(sym), .. }) => match sym { Some(DslVal::Key(sym)) => match sym.as_ref() {
"name" => name = Some(exp), "name" => name = Some(exp),
"info" => info = Some(exp), "info" => info = Some(exp),
"keys" => keys = Some(exp), "keys" => keys = Some(exp),
@ -378,23 +378,23 @@ impl Configuration {
Ok([name, info, view, keys]) Ok([name, info, view, keys])
} }
fn parse_info (mut iter: Cst) -> Option<Arc<str>> { fn parse_info <T: Dsl> (mut iter: T) -> Option<Arc<str>> {
iter.next().and_then(|x|if let Value::Str(x) = x.value { iter.next().and_then(|x|if let DslVal::Str(x) = x.value {
Some(x.into()) Some(x.into())
} else { } else {
None None
}) })
} }
fn parse_name (mut iter: Cst) -> Option<Arc<str>> { fn parse_name <T: Dsl> (mut iter: T) -> Option<Arc<str>> {
iter.next().and_then(|x|if let Value::Str(x) = x.value { iter.next().and_then(|x|if let DslVal::Str(x) = x.value {
Some(x.into()) Some(x.into())
} else { } else {
None None
}) })
} }
fn parse_view (iter: Option<Cst>) -> Usually<Cst> { fn parse_view <T: Dsl> (iter: Option<T>) -> Usually<T> {
if let Some(view) = iter { if let Some(view) = iter {
Ok(view) Ok(view)
} else { } else {
@ -402,8 +402,8 @@ impl Configuration {
} }
} }
fn parse_keys (base: &impl AsRef<Path>, iter: Option<Cst>) fn parse_keys <T: Dsl> (base: &impl AsRef<Path>, iter: Option<T>)
-> Usually<InputMap<App, AppCommand, TuiIn, Cst>> -> Usually<InputMap<TuiIn, T>>
{ {
if iter.is_none() { if iter.is_none() {
return Err(format!("missing keys definition").into()) return Err(format!("missing keys definition").into())
@ -411,12 +411,12 @@ impl Configuration {
let mut keys = iter.unwrap(); let mut keys = iter.unwrap();
let mut map = InputMap::default(); let mut map = InputMap::default();
while let Some(token) = keys.next() { while let Some(token) = keys.next() {
if let Value::Exp(_, mut exp) = token.value { if let DslVal::Exp(_, mut exp) = token.value {
let next = exp.next(); let next = exp.next();
if let Some(Token { value: Value::Key(sym), .. }) = next { if let Some(DslVal::Key(sym)) = next.val().map(|x|x.val()) {
match sym { match sym {
"layer" => { "layer" => {
if let Some(Token { value: Value::Str(path), .. }) = exp.peek() { if let Some(DslVal::Str(path)) = exp.peek().map(|x|x.val()) {
let path = base.as_ref().parent().unwrap().join(unquote(path)); let path = base.as_ref().parent().unwrap().join(unquote(path));
if !std::fs::exists(&path)? { if !std::fs::exists(&path)? {
return Err(format!("(e5) not found: {path:?}").into()) return Err(format!("(e5) not found: {path:?}").into())
@ -432,13 +432,13 @@ impl Configuration {
"layer-if" => { "layer-if" => {
let mut cond = None; let mut cond = None;
if let Some(Token { value: Value::Sym(sym), .. }) = exp.next() { if let Some(DslVal::Sym(sym)) = exp.next().map(|x|x.val()) {
cond = Some(leak(sym)); cond = Some(leak(sym));
} else { } else {
return Err(format!("(e4) unexpected non-symbol {next:?}").into()) return Err(format!("(e4) unexpected non-symbol {next:?}").into())
}; };
if let Some(Token { value: Value::Str(path), .. }) = exp.peek() { if let Some(DslVal::Str(path)) = exp.peek().map(|x|x.val()) {
let path = base.as_ref().parent().unwrap().join(unquote(path)); let path = base.as_ref().parent().unwrap().join(unquote(path));
if !std::fs::exists(&path)? { if !std::fs::exists(&path)? {
return Err(format!("(e5) not found: {path:?}").into()) return Err(format!("(e5) not found: {path:?}").into())
@ -448,11 +448,11 @@ impl Configuration {
let keys = read_and_leak(path)?.into(); let keys = read_and_leak(path)?.into();
let cond = cond.unwrap(); let cond = cond.unwrap();
println!("ok"); println!("ok");
map.add_layer_if( //map.add_layer_if(
Box::new(move |state: &App|Take::take_or_fail( //Box::new(move |state: &App|Take::take_or_fail(
state, exp, ||"missing input layer conditional" //state, exp, ||"missing input layer conditional"
)), keys //)), keys
); //);
} else { } else {
return Err(format!("(e4) unexpected non-symbol {next:?}").into()) return Err(format!("(e4) unexpected non-symbol {next:?}").into())
} }

24
crates/device/src/arranger/arranger_model.rs
View file

@ -58,18 +58,18 @@ maybe_has!(Track: |self: Arrangement|
maybe_has!(Scene: |self: Arrangement| maybe_has!(Scene: |self: Arrangement|
{ Has::<Selection>::get(self).track().map(|index|Has::<Vec<Scene>>::get(self).get(index)).flatten() }; { Has::<Selection>::get(self).track().map(|index|Has::<Vec<Scene>>::get(self).get(index)).flatten() };
{ Has::<Selection>::get(self).track().map(|index|Has::<Vec<Scene>>::get_mut(self).get_mut(index)).flatten() }); { Has::<Selection>::get(self).track().map(|index|Has::<Vec<Scene>>::get_mut(self).get_mut(index)).flatten() });
take!(MidiInputCommand |state: Arrangement, iter|state.selected_midi_in().as_ref() //take!(MidiInputCommand |state: Arrangement, iter|state.selected_midi_in().as_ref()
.map(|t|Take::take(t, iter)).transpose().map(|x|x.flatten())); //.map(|t|Take::take(t, iter)).transpose().map(|x|x.flatten()));
take!(MidiOutputCommand |state: Arrangement, iter|state.selected_midi_out().as_ref() //take!(MidiOutputCommand |state: Arrangement, iter|state.selected_midi_out().as_ref()
.map(|t|Take::take(t, iter)).transpose().map(|x|x.flatten())); //.map(|t|Take::take(t, iter)).transpose().map(|x|x.flatten()));
take!(DeviceCommand|state: Arrangement, iter|state.selected_device().as_ref() //take!(DeviceCommand|state: Arrangement, iter|state.selected_device().as_ref()
.map(|t|Take::take(t, iter)).transpose().map(|x|x.flatten())); //.map(|t|Take::take(t, iter)).transpose().map(|x|x.flatten()));
take!(TrackCommand |state: Arrangement, iter|state.selected_track().as_ref() //take!(TrackCommand |state: Arrangement, iter|state.selected_track().as_ref()
.map(|t|Take::take(t, iter)).transpose().map(|x|x.flatten())); //.map(|t|Take::take(t, iter)).transpose().map(|x|x.flatten()));
take!(SceneCommand |state: Arrangement, iter|state.selected_scene().as_ref() //take!(SceneCommand |state: Arrangement, iter|state.selected_scene().as_ref()
.map(|t|Take::take(t, iter)).transpose().map(|x|x.flatten())); //.map(|t|Take::take(t, iter)).transpose().map(|x|x.flatten()));
take!(ClipCommand |state: Arrangement, iter|state.selected_clip().as_ref() //take!(ClipCommand |state: Arrangement, iter|state.selected_clip().as_ref()
.map(|t|Take::take(t, iter)).transpose().map(|x|x.flatten())); //.map(|t|Take::take(t, iter)).transpose().map(|x|x.flatten()));
#[tengri_proc::expose] impl Arrangement { #[tengri_proc::expose] impl Arrangement {
fn selected_midi_in (&self) -> Option<MidiInput> { todo!() } fn selected_midi_in (&self) -> Option<MidiInput> { todo!() }
fn selected_midi_out (&self) -> Option<MidiOutput> { todo!() } fn selected_midi_out (&self) -> Option<MidiOutput> { todo!() }

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

@ -12,10 +12,10 @@ pub struct Pool {
/// Embedded file browser /// Embedded file browser
pub browser: Option<Browser>, pub browser: Option<Browser>,
} }
take!(BrowserCommand |state: Pool, iter|Ok(state.browser.as_ref() //take!(BrowserCommand |state: Pool, iter|Ok(state.browser.as_ref()
.map(|p|Take::take(p, iter)) //.map(|p|Take::take(p, iter))
.transpose()? //.transpose()?
.flatten())); //.flatten()));
impl Default for Pool { impl Default for Pool {
fn default () -> Self { fn default () -> Self {
use PoolMode::*; use PoolMode::*;

2
deps/tengri vendored

@ -1 +1 @@
Subproject commit 21832453d9554752a77278385446518744baeee8 Subproject commit ca4c558eab46aad27da145381e425908d995a625