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

collect edns under config/

Browse source
This commit is contained in:
🪞👃🪞 2025-04-27 17:54:02 +03:00
parent efd182f302
commit a2f27dac90
30 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/app/edn/arranger_keys.edn
View file

@ -1,24 +0,0 @@
(@esc menu)
(@f1 help)
(@u undo 1)
(@shift-u redo 1)
(@space clock toggle)
(@shift-space clock toggle 0)
(@t select :track 0)
(@tab edit :clip)
(@c color)
(@q launch)
(@shift-I input add)
(@shift-O output add)
(@shift-S scene add)
(@shift-T track add)
(@up select :scene-prev)
(@w select :scene-prev)
(@down select :scene-next)
(@s select :scene-next)
(@left select :track-prev)
(@a select :track-prev)
(@right select :track-next)
(@d select :track-next)

8
crates/app/edn/arranger_keys_clip.edn
View file

@ -1,8 +0,0 @@
(@g clip get)
(@p clip put)
(@delete clip del)
(@comma clip prev)
(@period clip next)
(@lt clip swap-prev)
(@gt clip swap-next)
(@l clip loop-toggle)

0
crates/app/edn/arranger_keys_mix.edn
View file

7
crates/app/edn/arranger_keys_scene.edn
View file

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

12
crates/app/edn/arranger_keys_track.edn
View file

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

14
crates/app/edn/groovebox_keys.edn
View file

@ -1,14 +0,0 @@
(@esc menu)
(@f1 help)
(@u undo 1)
(@shift-u redo 1)
(@space clock toggle)
(@shift-space clock toggle 0)
(@c color)
(@q launch)
(@r sampler record/begin :pitch)

13
crates/app/edn/sampler_keys.edn
View file

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

8
crates/app/edn/sequencer_keys.edn
View file

@ -1,8 +0,0 @@
(@u undo 1)
(@shift-u redo 1)
(@space clock toggle)
(@shift-space clock toggle 0)
(@c color)
(@q launch)
(@shift-I input add)
(@shift-O output add)

0
crates/app/examples/arranger.edn
View file

0
crates/app/examples/clip.edn
View file

12
crates/app/examples/mixer.edn
View file

@ -1,12 +0,0 @@
(mixer
(track
(name "Drums")
(sampler
(dir "/home/user/Lab/Music/pak")
(sample (midi 34) (name "808 D") (file "808.wav"))))
(track
(name "Lead")
(lv2
(name "Odin2")
(path "file:///home/user/.lv2/Odin2.lv2"))
(gain 0.0)))

0
crates/app/examples/sampler.edn
View file

18
crates/app/examples/sequencer.edn
View file

@ -1,18 +0,0 @@
(arranger
(track
(name "Drums")
(phrase
(name "4 kicks")
(beats 4)
(steps 16)
(:00 (36 128))
(:04 (36 100))
(:08 (36 100))
(:12 (36 100))))
(track
(name "Bass")
(phrase
(beats 4)
(steps 16)
(:04 (36 100))
(:12 (36 100)))))

16
crates/app/src/keys.rs
View file

@ -14,7 +14,7 @@ pub fn handle_arranger (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
}
}
// Handle from root keymap
if let Some(command) = SourceIter(include_str!("../edn/arranger_keys.edn"))
if let Some(command) = SourceIter(include_str!("../../../config/arranger_keys.edn"))
.command::<_, TekCommand, _>(app, input)
{
if let Some(undo) = command.execute(app)? { app.history.push(undo); }
@ -22,10 +22,10 @@ pub fn handle_arranger (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
}
// Handle from selection-dependent keymaps
if let Some(command) = match app.selected() {
Selection::Clip(_, _) => SourceIter(include_str!("../edn/arranger_keys_clip.edn")),
Selection::Track(_) => SourceIter(include_str!("../edn/arranger_keys_track.edn")),
Selection::Scene(_) => SourceIter(include_str!("../edn/arranger_keys_scene.edn")),
Selection::Mix => SourceIter(include_str!("../edn/arranger_keys_mix.edn")),
Selection::Clip(_, _) => SourceIter(include_str!("../../../config/arranger_keys_clip.edn")),
Selection::Track(_) => SourceIter(include_str!("../../../config/arranger_keys_track.edn")),
Selection::Scene(_) => SourceIter(include_str!("../../../config/arranger_keys_scene.edn")),
Selection::Mix => SourceIter(include_str!("../../../config/arranger_keys_mix.edn")),
}.command::<_, TekCommand, _>(app, input) {
if let Some(undo) = command.execute(app)? {
app.history.push(undo);
@ -39,7 +39,7 @@ pub fn handle_sequencer (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
if app.editor.handle(input)? == Some(true) {
return Ok(Some(true))
}
if let Some(command) = SourceIter(include_str!("../edn/sequencer_keys.edn"))
if let Some(command) = SourceIter(include_str!("../../../config/sequencer_keys.edn"))
.command::<_, TekCommand, _>(app, input)
{
if let Some(undo) = command.execute(app)? {
@ -54,7 +54,7 @@ pub fn handle_groovebox (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
if app.editor.handle(input)? == Some(true) {
return Ok(Some(true))
}
if let Some(command) = SourceIter(include_str!("../edn/groovebox_keys.edn"))
if let Some(command) = SourceIter(include_str!("../../../config/groovebox_keys.edn"))
.command::<_, TekCommand, _>(app, input)
{
if let Some(undo) = command.execute(app)? {
@ -67,7 +67,7 @@ pub fn handle_groovebox (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
pub fn handle_sampler (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
let sampler = app.tracks[0].sampler_mut(0).expect("no sampler");
if let Some(command) = SourceIter(include_str!("../edn/sampler_keys.edn"))
if let Some(command) = SourceIter(include_str!("../../../config/sampler_keys.edn"))
.command::<_, SamplerCommand, _>(sampler, input)
{
if let Some(undo) = command.execute(sampler)? {

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

@ -868,7 +868,7 @@ impl Modal {
Bsp::s(Tui::bold(true, "tek!"), Bsp::s("", Map::south(1, options, option)))
}
fn view_help (&self) -> impl Content<TuiOut> {
let bindings = ||TokenIter::new(include_str!("../edn/groovebox_keys.edn"))
let bindings = ||TokenIter::new(include_str!("../../../config/groovebox_keys.edn"))
.filter_map(|x|if let Value::Exp(_, iter)=x.value{
Some(iter)
} else {

6
crates/cli/edn/arranger.edn
View file

@ -1,6 +0,0 @@
(bsp/a :modal
(bsp/s (fixed/y 1 :transport)
(bsp/n (fixed/y 1 :status)
(fill/xy (bsp/a
(fill/xy (align/e :pool))
:arranger)))))

7
crates/cli/edn/groovebox.edn
View file

@ -1,7 +0,0 @@
(bsp/a :modal
(bsp/s (fixed/y 1 :transport)
(bsp/n (fixed/y 1 :status)
(bsp/n (fixed/y 5 :sample-viewer)
(bsp/w (fixed/x :w-sidebar :pool)
(bsp/e :samples-keys
(fill/y :editor)))))))

4
crates/cli/edn/sampler.edn
View file

@ -1,4 +0,0 @@
(bsp/a :modal
(bsp/s (fixed/y 1 :transport)
(bsp/n (fixed/y 1 :status)
(fill/xy :samples-grid))))

6
crates/cli/edn/sequencer.edn
View file

@ -1,6 +0,0 @@
(bsp/a :modal
(bsp/s (fixed/y 1 :transport)
(bsp/n (fixed/y 1 :status)
(fill/xy (bsp/a
(fill/xy (align/e :pool))
:editor)))))

1
crates/cli/edn/transport.edn
View file

@ -1 +0,0 @@
:transport

10
crates/cli/tek.rs
View file

@ -106,11 +106,11 @@ impl Cli {
color: ItemTheme::random(),
clock: Clock::new(jack, self.bpm)?,
view: SourceIter(match mode {
LaunchMode::Clock => include_str!("./edn/transport.edn"),
LaunchMode::Sequencer => include_str!("./edn/sequencer.edn"),
LaunchMode::Groovebox => include_str!("./edn/groovebox.edn"),
LaunchMode::Arranger { .. } => include_str!("./edn/arranger.edn"),
LaunchMode::Sampler => include_str!("./edn/sampler.edn"),
LaunchMode::Clock => include_str!("../../config/transport.edn"),
LaunchMode::Sequencer => include_str!("../../config/sequencer.edn"),
LaunchMode::Groovebox => include_str!("../../config/groovebox.edn"),
LaunchMode::Arranger { .. } => include_str!("../../config/arranger.edn"),
LaunchMode::Sampler => include_str!("../../config/sampler.edn"),
_ => todo!("{mode:?}"),
}),
pool: match mode {

6
crates/midi/edn/keys_clip_length.edn
View file

@ -1,6 +0,0 @@
(@up inc)
(@down dec)
(@right next)
(@left prev)
(@return set :length)
(@escape cancel)

4
crates/midi/edn/keys_clip_rename.edn
View file

@ -1,4 +0,0 @@
(:char append :char)
(@backspace delete :last)
(@return confirm)
(@escape cancel)

30
crates/midi/edn/keys_edit.edn
View file

@ -1,30 +0,0 @@
(@up note/pos :note-pos-next)
(@w note/pos :note-pos-next)
(@down note/pos :note-pos-prev)
(@s note/pos :note-pos-prev)
(@pgup note/pos :note-pos-next-octave)
(@pgdn note/pos :note-pos-prev-octave)
(@comma note/len :note-len-prev)
(@period note/len :note-len-next)
(@lt note/len :note-len-prev)
(@gt note/len :note-len-next)
(@plus note/range :note-range-next)
(@underscore note/range :note-range-prev)
(@left time/pos :time-pos-prev)
(@a time/pos :time-pos-prev)
(@right time/pos :time-pos-next)
(@d time/pos :time-pos-next)
(@equal time/zoom :time-zoom-prev)
(@minus time/zoom :time-zoom-next)
(@z time/lock)
(@enter note/put)
(@shift-enter note/append)
(@del note/del)
(@shift-del note/del)

12
crates/midi/edn/keys_pool.edn
View file

@ -1,12 +0,0 @@
(@n rename begin)
(@t length begin)
(@m import begin)
(@x export begin)
(@c clip color :clip :random-color)
(@openbracket select :clip-prev)
(@closebracket select :clip-next)
(@lt swap :clip :clip-prev)
(@gt swap :clip :clip-next)
(@delete clip/delete :clip)
(@shift-A clip/add :after :new-clip)
(@shift-D clip/add :after :cloned-clip)

8
crates/midi/edn/keys_pool_file.edn
View file

@ -1,8 +0,0 @@
(@up select :prev)
(@down select :next)
(@right chdir :selected)
(@left chdir :parent)
(@return confirm)
(@escape cancel)
(:char append :char)
(@backspace delete :last)

2
crates/midi/src/clip/clip_editor.rs
View file

@ -21,7 +21,7 @@ impl Default for MidiEditor {
Self {
mode: PianoHorizontal::new(None),
size: Measure::new(),
keys: SourceIter(include_str!("../../edn/keys_edit.edn")),
keys: SourceIter(include_str!("../../../../config/keys_edit.edn")),
}
}
}

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

@ -23,10 +23,10 @@ impl Default for MidiPool {
clips: Arc::from(RwLock::from(vec![])),
clip: 0.into(),
mode: None,
keys: SourceIter(include_str!("../../edn/keys_pool.edn")),
keys_file: SourceIter(include_str!("../../edn/keys_pool_file.edn")),
keys_rename: SourceIter(include_str!("../../edn/keys_clip_rename.edn")),
keys_length: SourceIter(include_str!("../../edn/keys_clip_length.edn")),
keys: SourceIter(include_str!("../../../../config/keys_pool.edn")),
keys_file: SourceIter(include_str!("../../../../config/keys_pool_file.edn")),
keys_rename: SourceIter(include_str!("../../../../config/keys_clip_rename.edn")),
keys_length: SourceIter(include_str!("../../../../config/keys_clip_length.edn")),
}
}
}

0
crates/plugin/edn/plugin-keys.edn
View file

0
crates/plugin/edn/plugin-view.edn
View file