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

Compare commits

base: unspeaker:daaa4f7befaf0ee1d23b96dbe911b485c5b66c06
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:2fd7d7b39f85ff9bca1ba1368c8963ce4755583a
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. "daaa4f7befaf0ee1d23b96dbe911b485c5b66c06" and "2fd7d7b39f85ff9bca1ba1368c8963ce4755583a" have entirely different histories.
daaa4f7bef ... 2fd7d7b39f

9 changed files with 63 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/keys_groovebox.edn
View file

@ -1 +1 @@
(@r sampler record/toggle :sample) (@r sampler record/begin :pitch)

18
config/keys_sampler.edn
View file

@ -1,13 +1,13 @@
(@up sampler select :sample-up) (@up select :sample-up)
(@w sampler select :sample-up) (@w select :sample-up)
(@down sampler select :sample-down) (@down select :sample-down)
(@s sampler select :sample-down) (@s select :sample-down)
(@left sampler select :sample-left) (@left select :sample-left)
(@a sampler select :sample-left) (@a select :sample-left)
(@right sampler select :sample-right) (@right select :sample-right)
(@d sampler select :sample-right) (@d select :sample-right)
(@r sampler record/toggle :sample) (@r record/toggle :sample)

2
config/keys_scene.edn
View file

@ -1,7 +1,7 @@
(@delete scene delete :scene)
(@q scene launch :scene) (@q scene launch :scene)
(@c scene color :scene) (@c scene color :scene)
(@comma scene prev) (@comma scene prev)
(@period scene next) (@period scene next)
(@lt scene swap-prev) (@lt scene swap-prev)
(@gt scene swap-next) (@gt scene swap-next)
(@delete scene delete)

3
config/keys_track.edn
View file

@ -1,10 +1,11 @@
(@delete track delete :track)
(@q track launch :track) (@q track launch :track)
(@c track color :track) (@c track color :track)
(@comma track prev) (@comma track prev)
(@period track next) (@period track next)
(@lt track swap-prev) (@lt track swap-prev)
(@gt track swap-next) (@gt track swap-next)
(@delete track delete)
(@r track rec) (@r track rec)
(@m track mon) (@m track mon)
(@p track play) (@p track play)

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

@ -34,9 +34,6 @@ expose!([self: Tek]
handle!(TuiIn: |self: Tek, input|Ok(if let Some(command) = self.keys.command(self, input) { handle!(TuiIn: |self: Tek, input|Ok(if let Some(command) = self.keys.command(self, input) {
let undo = command.execute(self)?; let undo = command.execute(self)?;
if let Some(undo) = undo {
self.history.push(undo);
}
Some(true) Some(true)
} else { } else {
None None
@ -71,15 +68,13 @@ impose!([app: Tek]
(t, 0) => Self::Select(Selection::Track(t)), (t, 0) => Self::Select(Selection::Track(t)),
(0, s) => Self::Select(Selection::Scene(s)), (0, s) => Self::Select(Selection::Scene(s)),
(t, s) => Self::Select(Selection::Clip(t, s)) }))) (t, s) => Self::Select(Selection::Clip(t, s)) })))
(ClipCommand: (ClipCommand:
("edit" [a: MaybeClip] Some(Self::Edit(a.unwrap()))) ("edit" [a: MaybeClip] Some(Self::Edit(a.unwrap())))
("color" [a: usize, b: usize] Some(Self::SetColor(a.unwrap(), b.unwrap(), ItemTheme::random()))) ("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()))) ("enqueue" [a: usize, b: usize] Some(Self::Enqueue(a.unwrap(), b.unwrap())))
("get" [a: usize, b: usize] Some(Self::Get(a.unwrap(), b.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()))) ("loop" [a: usize, b: usize, c: bool] Some(Self::SetLoop(a.unwrap(), b.unwrap(), c.unwrap())))
("put" [a: usize, b: usize, c: MaybeClip] Some(Self::Put(a.unwrap(), b.unwrap(), c.unwrap()))) ("put" [a: usize, b: usize, c: MaybeClip] Some(Self::Put(a.unwrap(), b.unwrap(), c.unwrap()))))
("delete" [a: usize, b: usize] Some(Self::Put(a.unwrap(), b.unwrap(), None))))
(InputCommand: (InputCommand:
("add" [] Some(Self::Add))) ("add" [] Some(Self::Add)))
@ -89,7 +84,7 @@ impose!([app: Tek]
(SceneCommand: (SceneCommand:
("add" [] Some(Self::Add)) ("add" [] Some(Self::Add))
("delete" [a: Option<usize>] Some(Self::Del(a.flatten().unwrap()))) ("del" [a: usize] Some(Self::Del(0)))
("zoom" [a: usize] Some(Self::SetZoom(a.unwrap()))) ("zoom" [a: usize] Some(Self::SetZoom(a.unwrap())))
("color" [a: usize] Some(Self::SetColor(a.unwrap(), ItemTheme::G[128]))) ("color" [a: usize] Some(Self::SetColor(a.unwrap(), ItemTheme::G[128])))
("enqueue" [a: usize] Some(Self::Enqueue(a.unwrap()))) ("enqueue" [a: usize] Some(Self::Enqueue(a.unwrap())))
@ -100,7 +95,7 @@ impose!([app: Tek]
("size" [a: usize] Some(Self::SetSize(a.unwrap()))) ("size" [a: usize] Some(Self::SetSize(a.unwrap())))
("zoom" [a: usize] Some(Self::SetZoom(a.unwrap()))) ("zoom" [a: usize] Some(Self::SetZoom(a.unwrap())))
("color" [a: usize] Some(Self::SetColor(a.unwrap(), ItemTheme::random()))) ("color" [a: usize] Some(Self::SetColor(a.unwrap(), ItemTheme::random())))
("delete" [a: Option<usize>] Some(Self::Del(a.flatten().unwrap()))) ("del" [a: usize] Some(Self::Del(a.unwrap())))
("stop" [a: usize] Some(Self::Stop(a.unwrap()))) ("stop" [a: usize] Some(Self::Stop(a.unwrap())))
("swap" [a: usize, b: usize] Some(Self::Swap(a.unwrap(), b.unwrap()))) ("swap" [a: usize, b: usize] Some(Self::Swap(a.unwrap(), b.unwrap())))
("play" [] Some(Self::TogglePlay)) ("play" [] Some(Self::TogglePlay))

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

@ -53,7 +53,7 @@ pub struct Tek {
// Modal overlay // Modal overlay
pub modal: Option<Modal>, pub modal: Option<Modal>,
// Input keymap // Input keymap
pub keys: InputMap<'static, Self, TekCommand, TuiIn, TokenIter<'static>> pub keys: InputMap<'static, Self, TekCommand, TuiIn, SourceIter<'static>>
} }
impl Tek { impl Tek {

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

@ -41,23 +41,21 @@ impl Tek {
Bsp::s(Tui::bold(true, "tek!"), Bsp::s("", Map::south(1, options, option))) Bsp::s(Tui::bold(true, "tek!"), Bsp::s("", Map::south(1, options, option)))
} }
fn view_modal_help (&self) -> impl Content<TuiOut> + use<'_> { fn view_modal_help (&self) -> impl Content<TuiOut> {
let bindings = ||self.keys.layers.iter() let bindings = ||TokenIter::new(include_str!("../../../config/keys_groovebox.edn"))
.filter_map(|a|(a.0)(self).then_some(a.1))
.flat_map(|a|a)
.filter_map(|x|if let Value::Exp(_, iter)=x.value{ .filter_map(|x|if let Value::Exp(_, iter)=x.value{
Some(iter) Some(iter)
} else { } else {
None None
}); });
let binding = |mut binding: TokenIter, _|Bsp::e( let binding = |mut binding: TokenIter, _|Bsp::e(
Fixed::x(15, Align::w(Tui::bold(true, Tui::fg(Color::Rgb(255,192,0), if let Some(Token { Tui::bold(true, Tui::fg(Color::Rgb(255,192,0), if let Some(Token {
value: Value::Sym(key), .. value: Value::Sym(key), ..
}) = binding.next() { }) = binding.next() {
Some(key.to_string()) Some(key.to_string())
} else { } else {
None None
})))), })),
Bsp::e(" ", Tui::fg(Color::Rgb(255,255,255), if let Some(Token { Bsp::e(" ", Tui::fg(Color::Rgb(255,255,255), if let Some(Token {
value: Value::Key(command), .. value: Value::Key(command), ..
}) = binding.next() { }) = binding.next() {
@ -66,7 +64,8 @@ impl Tek {
None None
})), })),
); );
Bsp::s(Tui::bold(true, "Help"), Bsp::s("", Map::south(1, bindings, binding))) let layer = Map::south(1, bindings, binding);
Bsp::s(Tui::bold(true, "Help"), Bsp::s("", layer))
} }
pub fn view_status (&self) -> impl Content<TuiOut> + use<'_> { pub fn view_status (&self) -> impl Content<TuiOut> + use<'_> {

49
crates/cli/tek.rs
View file

@ -120,36 +120,33 @@ impl Cli {
}), }),
keys: match mode { keys: match mode {
LaunchMode::Sampler => InputMap::default() LaunchMode::Sampler => InputMap::default()
.layer(SourceIter(include_str!("../../config/keys_global.edn")).into()) .layer(SourceIter(include_str!("../../config/keys_global.edn")))
.layer(SourceIter(include_str!("../../config/keys_sampler.edn")).into()), .layer(SourceIter(include_str!("../../config/keys_sampler.edn"))),
LaunchMode::Clock => InputMap::default() LaunchMode::Clock => InputMap::default()
.layer(SourceIter(include_str!("../../config/keys_global.edn")).into()) .layer(SourceIter(include_str!("../../config/keys_global.edn")))
.layer(SourceIter(include_str!("../../config/keys_clock.edn")).into()), .layer(SourceIter(include_str!("../../config/keys_clock.edn"))),
LaunchMode::Sequencer => InputMap::default() LaunchMode::Sequencer => InputMap::default()
.layer(SourceIter(include_str!("../../config/keys_global.edn")).into()) .layer(SourceIter(include_str!("../../config/keys_global.edn")))
.layer(SourceIter(include_str!("../../config/keys_editor.edn")).into()) .layer(SourceIter(include_str!("../../config/keys_editor.edn")))
.layer(SourceIter(include_str!("../../config/keys_clock.edn")).into()) .layer(SourceIter(include_str!("../../config/keys_clock.edn")))
.layer(SourceIter(include_str!("../../config/keys_sequencer.edn")).into()), .layer(SourceIter(include_str!("../../config/keys_sequencer.edn"))),
LaunchMode::Groovebox => InputMap::default() LaunchMode::Groovebox => InputMap::default()
.layer(SourceIter(include_str!("../../config/keys_global.edn")).into()) .layer(SourceIter(include_str!("../../config/keys_global.edn")))
.layer(SourceIter(include_str!("../../config/keys_editor.edn")).into()) .layer(SourceIter(include_str!("../../config/keys_editor.edn")))
.layer(SourceIter(include_str!("../../config/keys_clock.edn")).into()) .layer(SourceIter(include_str!("../../config/keys_clock.edn")))
.layer(SourceIter(include_str!("../../config/keys_sequencer.edn")).into()) .layer(SourceIter(include_str!("../../config/keys_sequencer.edn")))
.layer(SourceIter(include_str!("../../config/keys_groovebox.edn")).into()), .layer(SourceIter(include_str!("../../config/keys_groovebox.edn"))),
LaunchMode::Arranger {..} => InputMap::default() LaunchMode::Arranger {..} => InputMap::default()
.layer(SourceIter(include_str!("../../config/keys_global.edn")).into()) .layer(SourceIter(include_str!("../../config/keys_global.edn")))
.layer_if(|state: &Tek|state.is_editing(), .layer_if(
SourceIter(include_str!("../../config/keys_editor.edn")).into()) |state: &Tek|state.is_editing(),
.layer_if(|state: &Tek|state.selected.is_clip()&&!state.is_editing(), SourceIter(include_str!("../../config/keys_editor.edn")))
SourceIter(include_str!("../../config/keys_clip.edn")).into()) .layer(SourceIter(include_str!("../../config/keys_clock.edn")))
.layer_if(|state: &Tek|state.selected.is_track()&&!state.is_editing(), .layer(SourceIter(include_str!("../../config/keys_arranger.edn")))
SourceIter(include_str!("../../config/keys_track.edn")).into()) .layer(SourceIter(include_str!("../../config/keys_clip.edn")))
.layer_if(|state: &Tek|state.selected.is_scene()&&!state.is_editing(), .layer(SourceIter(include_str!("../../config/keys_track.edn")))
SourceIter(include_str!("../../config/keys_scene.edn")).into()) .layer(SourceIter(include_str!("../../config/keys_scene.edn")))
.layer_if(|state: &Tek|state.selected.is_mix()&&!state.is_editing(), .layer(SourceIter(include_str!("../../config/keys_mix.edn"))),
SourceIter(include_str!("../../config/keys_mix.edn")).into())
.layer(SourceIter(include_str!("../../config/keys_clock.edn")).into())
.layer(SourceIter(include_str!("../../config/keys_arranger.edn")).into()),
_ => todo!("{mode:?}"), _ => todo!("{mode:?}"),
}, },
pool: match mode { pool: match mode {

2
deps/tengri vendored

@ -1 +1 @@
Subproject commit 44ebe17c665b3a65e7a3a0020eff290093fc7ed2 Subproject commit 4ec51d5b694c14ccf617ec4538da04089b17ab92