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

cleanup unused edns

Browse source
This commit is contained in:
🪞👃🪞 2025-04-27 17:57:36 +03:00
parent a2f27dac90
commit 26b7a9390e
20 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

0
config/mixer.edn → .old/todo_project1.edn
View file

0
config/clip.edn
View file

0
config/arranger_keys.edn → config/keys_arranger.edn
View file

0
config/arranger_keys_clip.edn → config/keys_arranger_clip.edn
View file

0
config/arranger_keys_mix.edn → config/keys_arranger_mix.edn
View file

0
config/arranger_keys_scene.edn → config/keys_arranger_scene.edn
View file

0
config/arranger_keys_track.edn → config/keys_arranger_track.edn
View file

0
config/groovebox_keys.edn → config/keys_groovebox.edn
View file

0
config/sampler_keys.edn → config/keys_sampler.edn
View file

0
config/sequencer_keys.edn → config/keys_sequencer.edn
View file

0
config/plugin-keys.edn
View file

0
config/plugin-view.edn
View file

0
config/arranger.edn → config/view_arranger.edn
View file

0
config/groovebox.edn → config/view_groovebox.edn
View file

0
config/sampler.edn → config/view_sampler.edn
View file

0
config/sequencer.edn → config/view_sequencer.edn
View file

0
config/transport.edn → config/view_transport.edn
View file

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 // Handle from root keymap
if let Some(command) = SourceIter(include_str!("../../../config/arranger_keys.edn")) if let Some(command) = SourceIter(include_str!("../../../config/keys_arranger.edn"))
.command::<_, TekCommand, _>(app, input) .command::<_, TekCommand, _>(app, input)
{ {
if let Some(undo) = command.execute(app)? { app.history.push(undo); } 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 // Handle from selection-dependent keymaps
if let Some(command) = match app.selected() { if let Some(command) = match app.selected() {
Selection::Clip(_, _) => SourceIter(include_str!("../../../config/arranger_keys_clip.edn")), Selection::Clip(_, _) => SourceIter(include_str!("../../../config/keys_arranger_clip.edn")),
Selection::Track(_) => SourceIter(include_str!("../../../config/arranger_keys_track.edn")), Selection::Track(_) => SourceIter(include_str!("../../../config/keys_arranger_track.edn")),
Selection::Scene(_) => SourceIter(include_str!("../../../config/arranger_keys_scene.edn")), Selection::Scene(_) => SourceIter(include_str!("../../../config/keys_arranger_scene.edn")),
Selection::Mix => SourceIter(include_str!("../../../config/arranger_keys_mix.edn")), Selection::Mix => SourceIter(include_str!("../../../config/keys_arranger_mix.edn")),
}.command::<_, TekCommand, _>(app, input) { }.command::<_, TekCommand, _>(app, input) {
if let Some(undo) = command.execute(app)? { if let Some(undo) = command.execute(app)? {
app.history.push(undo); 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) { if app.editor.handle(input)? == Some(true) {
return Ok(Some(true)) return Ok(Some(true))
} }
if let Some(command) = SourceIter(include_str!("../../../config/sequencer_keys.edn")) if let Some(command) = SourceIter(include_str!("../../../config/keys_sequencer.edn"))
.command::<_, TekCommand, _>(app, input) .command::<_, TekCommand, _>(app, input)
{ {
if let Some(undo) = command.execute(app)? { 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) { if app.editor.handle(input)? == Some(true) {
return Ok(Some(true)) return Ok(Some(true))
} }
if let Some(command) = SourceIter(include_str!("../../../config/groovebox_keys.edn")) if let Some(command) = SourceIter(include_str!("../../../config/keys_groovebox.edn"))
.command::<_, TekCommand, _>(app, input) .command::<_, TekCommand, _>(app, input)
{ {
if let Some(undo) = command.execute(app)? { 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> { pub fn handle_sampler (app: &mut Tek, input: &TuiIn) -> Perhaps<bool> {
let sampler = app.tracks[0].sampler_mut(0).expect("no sampler"); let sampler = app.tracks[0].sampler_mut(0).expect("no sampler");
if let Some(command) = SourceIter(include_str!("../../../config/sampler_keys.edn")) if let Some(command) = SourceIter(include_str!("../../../config/keys_sampler.edn"))
.command::<_, SamplerCommand, _>(sampler, input) .command::<_, SamplerCommand, _>(sampler, input)
{ {
if let Some(undo) = command.execute(sampler)? { 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))) Bsp::s(Tui::bold(true, "tek!"), Bsp::s("", Map::south(1, options, option)))
} }
fn view_help (&self) -> impl Content<TuiOut> { fn view_help (&self) -> impl Content<TuiOut> {
let bindings = ||TokenIter::new(include_str!("../../../config/groovebox_keys.edn")) let bindings = ||TokenIter::new(include_str!("../../../config/keys_groovebox.edn"))
.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 {

10
crates/cli/tek.rs
View file

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