From 8794b2e05be9d43cd5e2fa1dbb84b5e0fd43794d Mon Sep 17 00:00:00 2001 From: unspeaker Date: Tue, 4 Mar 2025 19:02:48 +0200 Subject: [PATCH] group modules and scripts --- app/{src => edn}/arranger.edn | 0 app/{src => edn}/keys.edn | 0 app/{src => edn}/keys_clip.edn | 0 app/{src => edn}/keys_mix.edn | 0 app/{src => edn}/keys_scene.edn | 0 app/{src => edn}/keys_track.edn | 0 app/edn/view_arranger.edn | 9 +++++++++ app/{src => edn}/view_groovebox.edn | 0 app/{src => edn}/view_sequencer.edn | 0 app/{src => edn}/view_transport.edn | 0 app/src/cli.rs | 8 ++++---- app/src/keys.rs | 15 ++++++++++----- app/src/{ => keys}/keys_clip.rs | 0 app/src/{ => keys}/keys_ins.rs | 0 app/src/{ => keys}/keys_outs.rs | 0 app/src/{ => keys}/keys_scene.rs | 0 app/src/{ => keys}/keys_track.rs | 0 app/src/lib.rs | 15 --------------- app/src/model.rs | 3 +++ app/src/{ => model}/model_scene.rs | 0 app/src/{ => model}/model_select.rs | 0 app/src/{ => model}/model_track.rs | 0 app/src/view.rs | 7 +++++++ app/src/{ => view}/view_arranger.rs | 0 app/src/{ => view}/view_clock.rs | 0 app/src/{ => view}/view_color.rs | 0 app/src/{ => view}/view_iter.rs | 0 app/src/{ => view}/view_memo.rs | 0 app/src/{ => view}/view_meter.rs | 0 app/src/{ => view}/view_sizes.rs | 0 app/src/view_arranger.edn | 1 - cli/tek.rs | 2 +- 32 files changed, 34 insertions(+), 26 deletions(-) rename app/{src => edn}/arranger.edn (100%) rename app/{src => edn}/keys.edn (100%) rename app/{src => edn}/keys_clip.edn (100%) rename app/{src => edn}/keys_mix.edn (100%) rename app/{src => edn}/keys_scene.edn (100%) rename app/{src => edn}/keys_track.edn (100%) create mode 100644 app/edn/view_arranger.edn rename app/{src => edn}/view_groovebox.edn (100%) rename app/{src => edn}/view_sequencer.edn (100%) rename app/{src => edn}/view_transport.edn (100%) rename app/src/{ => keys}/keys_clip.rs (100%) rename app/src/{ => keys}/keys_ins.rs (100%) rename app/src/{ => keys}/keys_outs.rs (100%) rename app/src/{ => keys}/keys_scene.rs (100%) rename app/src/{ => keys}/keys_track.rs (100%) rename app/src/{ => model}/model_scene.rs (100%) rename app/src/{ => model}/model_select.rs (100%) rename app/src/{ => model}/model_track.rs (100%) rename app/src/{ => view}/view_arranger.rs (100%) rename app/src/{ => view}/view_clock.rs (100%) rename app/src/{ => view}/view_color.rs (100%) rename app/src/{ => view}/view_iter.rs (100%) rename app/src/{ => view}/view_memo.rs (100%) rename app/src/{ => view}/view_meter.rs (100%) rename app/src/{ => view}/view_sizes.rs (100%) delete mode 100644 app/src/view_arranger.edn diff --git a/app/src/arranger.edn b/app/edn/arranger.edn similarity index 100% rename from app/src/arranger.edn rename to app/edn/arranger.edn diff --git a/app/src/keys.edn b/app/edn/keys.edn similarity index 100% rename from app/src/keys.edn rename to app/edn/keys.edn diff --git a/app/src/keys_clip.edn b/app/edn/keys_clip.edn similarity index 100% rename from app/src/keys_clip.edn rename to app/edn/keys_clip.edn diff --git a/app/src/keys_mix.edn b/app/edn/keys_mix.edn similarity index 100% rename from app/src/keys_mix.edn rename to app/edn/keys_mix.edn diff --git a/app/src/keys_scene.edn b/app/edn/keys_scene.edn similarity index 100% rename from app/src/keys_scene.edn rename to app/edn/keys_scene.edn diff --git a/app/src/keys_track.edn b/app/edn/keys_track.edn similarity index 100% rename from app/src/keys_track.edn rename to app/edn/keys_track.edn diff --git a/app/edn/view_arranger.edn b/app/edn/view_arranger.edn new file mode 100644 index 00000000..01c42c51 --- /dev/null +++ b/app/edn/view_arranger.edn @@ -0,0 +1,9 @@ +(bsp/n + (fixed/y 2 :transport) + (bsp/s + (fixed/y 2 :status) + (fill/xy + (bsp/a + (fill/xy + (align/e :pool)) + :arranger)))) diff --git a/app/src/view_groovebox.edn b/app/edn/view_groovebox.edn similarity index 100% rename from app/src/view_groovebox.edn rename to app/edn/view_groovebox.edn diff --git a/app/src/view_sequencer.edn b/app/edn/view_sequencer.edn similarity index 100% rename from app/src/view_sequencer.edn rename to app/edn/view_sequencer.edn diff --git a/app/src/view_transport.edn b/app/edn/view_transport.edn similarity index 100% rename from app/src/view_transport.edn rename to app/edn/view_transport.edn diff --git a/app/src/cli.rs b/app/src/cli.rs index 9643d25d..ad115d88 100644 --- a/app/src/cli.rs +++ b/app/src/cli.rs @@ -100,7 +100,7 @@ impl Tek { midi_froms: &[PortConnect], midi_tos: &[PortConnect], ) -> Usually { let tek = Self { - view: SourceIter(include_str!("./view_transport.edn")), + view: SourceIter(include_str!("../edn/view_transport.edn")), jack: jack.clone(), color: ItemPalette::random(), clock: Clock::new(jack, bpm)?, @@ -147,7 +147,7 @@ impl Tek { let clip = Arc::new(RwLock::new(clip)); let this = Self::new_clock(jack, bpm, sync_lead, sync_follow, midi_froms, midi_tos)?; Ok(Self { - view: SourceIter(include_str!("./view_sequencer.edn")), + view: SourceIter(include_str!("../edn/view_sequencer.edn")), pool: Some((&clip).into()), editor: Some((&clip).into()), editing: false.into(), @@ -164,7 +164,7 @@ impl Tek { audio_froms: &[&[PortConnect];2], audio_tos: &[&[PortConnect];2], ) -> Usually { let tek = Self { - view: SourceIter(include_str!("./view_groovebox.edn")), + view: SourceIter(include_str!("../edn/view_groovebox.edn")), tracks: vec![Track { devices: vec![Sampler::new(jack, &"sampler", midi_froms, audio_froms, audio_tos)?.boxed()], ..Track::default() @@ -184,7 +184,7 @@ impl Tek { scenes: usize, tracks: usize, track_width: usize, ) -> Usually { let mut tek = Self { - view: SourceIter(include_str!("./view_arranger.edn")), + view: SourceIter(include_str!("../edn/view_arranger.edn")), pool: Some(Default::default()), editor: Some(Default::default()), editing: false.into(), diff --git a/app/src/keys.rs b/app/src/keys.rs index c376bd3e..0943118d 100644 --- a/app/src/keys.rs +++ b/app/src/keys.rs @@ -1,9 +1,14 @@ use crate::*; -pub const KEYS_APP: &str = include_str!("keys.edn"); -pub const KEYS_CLIP: &str = include_str!("keys_clip.edn"); -pub const KEYS_TRACK: &str = include_str!("keys_track.edn"); -pub const KEYS_SCENE: &str = include_str!("keys_scene.edn"); -pub const KEYS_MIX: &str = include_str!("keys_mix.edn"); +mod keys_clip; pub use self::keys_clip::*; +mod keys_ins; pub use self::keys_ins::*; +mod keys_outs; pub use self::keys_outs::*; +mod keys_scene; pub use self::keys_scene::*; +mod keys_track; pub use self::keys_track::*; +pub const KEYS_APP: &str = include_str!("../edn/keys.edn"); +pub const KEYS_CLIP: &str = include_str!("../edn/keys_clip.edn"); +pub const KEYS_TRACK: &str = include_str!("../edn/keys_track.edn"); +pub const KEYS_SCENE: &str = include_str!("../edn/keys_scene.edn"); +pub const KEYS_MIX: &str = include_str!("../edn/keys_mix.edn"); handle!(TuiIn: |self: Tek, input|Ok({ // If editing, editor keys take priority if self.is_editing() { diff --git a/app/src/keys_clip.rs b/app/src/keys/keys_clip.rs similarity index 100% rename from app/src/keys_clip.rs rename to app/src/keys/keys_clip.rs diff --git a/app/src/keys_ins.rs b/app/src/keys/keys_ins.rs similarity index 100% rename from app/src/keys_ins.rs rename to app/src/keys/keys_ins.rs diff --git a/app/src/keys_outs.rs b/app/src/keys/keys_outs.rs similarity index 100% rename from app/src/keys_outs.rs rename to app/src/keys/keys_outs.rs diff --git a/app/src/keys_scene.rs b/app/src/keys/keys_scene.rs similarity index 100% rename from app/src/keys_scene.rs rename to app/src/keys/keys_scene.rs diff --git a/app/src/keys_track.rs b/app/src/keys/keys_track.rs similarity index 100% rename from app/src/keys_track.rs rename to app/src/keys/keys_track.rs diff --git a/app/src/lib.rs b/app/src/lib.rs index 56705877..e9dfd04c 100644 --- a/app/src/lib.rs +++ b/app/src/lib.rs @@ -10,23 +10,8 @@ mod cli; pub use self::cli::*; mod audio; pub use self::audio::*; mod device; pub use self::device::*; mod keys; pub use self::keys::*; -mod keys_clip; pub use self::keys_clip::*; -mod keys_ins; pub use self::keys_ins::*; -mod keys_outs; pub use self::keys_outs::*; -mod keys_scene; pub use self::keys_scene::*; -mod keys_track; pub use self::keys_track::*; mod model; pub use self::model::*; -mod model_track; pub use self::model_track::*; -mod model_scene; pub use self::model_scene::*; -mod model_select; pub use self::model_select::*; mod view; pub use self::view::*; -mod view_arranger; pub use self::view_arranger::*; -mod view_clock; pub use self::view_clock::*; -mod view_color; pub use self::view_color::*; -mod view_iter; pub use self::view_iter::*; -mod view_memo; pub use self::view_memo::*; -mod view_meter; pub use self::view_meter::*; -mod view_sizes; pub use self::view_sizes::*; /// Standard result type. pub type Usually = std::result::Result>; /// Standard optional result type. diff --git a/app/src/model.rs b/app/src/model.rs index d084fef3..e076e0c8 100644 --- a/app/src/model.rs +++ b/app/src/model.rs @@ -1,4 +1,7 @@ use crate::*; +mod model_track; pub use self::model_track::*; +mod model_scene; pub use self::model_scene::*; +mod model_select; pub use self::model_select::*; #[derive(Default, Debug)] pub struct Tek { /// Must not be dropped for the duration of the process pub jack: Jack, diff --git a/app/src/model_scene.rs b/app/src/model/model_scene.rs similarity index 100% rename from app/src/model_scene.rs rename to app/src/model/model_scene.rs diff --git a/app/src/model_select.rs b/app/src/model/model_select.rs similarity index 100% rename from app/src/model_select.rs rename to app/src/model/model_select.rs diff --git a/app/src/model_track.rs b/app/src/model/model_track.rs similarity index 100% rename from app/src/model_track.rs rename to app/src/model/model_track.rs diff --git a/app/src/view.rs b/app/src/view.rs index e7a5f986..f9ac3209 100644 --- a/app/src/view.rs +++ b/app/src/view.rs @@ -1,4 +1,11 @@ use crate::*; +mod view_arranger; pub use self::view_arranger::*; +mod view_clock; pub use self::view_clock::*; +mod view_color; pub use self::view_color::*; +mod view_iter; pub use self::view_iter::*; +mod view_memo; pub use self::view_memo::*; +mod view_meter; pub use self::view_meter::*; +mod view_sizes; pub use self::view_sizes::*; pub(crate) use std::fmt::Write; pub(crate) use ::tek_tui::ratatui::prelude::Position; pub(crate) trait ScenesColors<'a> = Iterator>; diff --git a/app/src/view_arranger.rs b/app/src/view/view_arranger.rs similarity index 100% rename from app/src/view_arranger.rs rename to app/src/view/view_arranger.rs diff --git a/app/src/view_clock.rs b/app/src/view/view_clock.rs similarity index 100% rename from app/src/view_clock.rs rename to app/src/view/view_clock.rs diff --git a/app/src/view_color.rs b/app/src/view/view_color.rs similarity index 100% rename from app/src/view_color.rs rename to app/src/view/view_color.rs diff --git a/app/src/view_iter.rs b/app/src/view/view_iter.rs similarity index 100% rename from app/src/view_iter.rs rename to app/src/view/view_iter.rs diff --git a/app/src/view_memo.rs b/app/src/view/view_memo.rs similarity index 100% rename from app/src/view_memo.rs rename to app/src/view/view_memo.rs diff --git a/app/src/view_meter.rs b/app/src/view/view_meter.rs similarity index 100% rename from app/src/view_meter.rs rename to app/src/view/view_meter.rs diff --git a/app/src/view_sizes.rs b/app/src/view/view_sizes.rs similarity index 100% rename from app/src/view_sizes.rs rename to app/src/view/view_sizes.rs diff --git a/app/src/view_arranger.edn b/app/src/view_arranger.edn deleted file mode 100644 index 7e79d1ad..00000000 --- a/app/src/view_arranger.edn +++ /dev/null @@ -1 +0,0 @@ -(bsp/n (fixed/y 2 :transport) (bsp/s (fixed/y 2 :status) (fill/xy (bsp/a (fill/xy (align/e :pool)) :arranger)))) diff --git a/cli/tek.rs b/cli/tek.rs index 06930bf4..854c45ea 100644 --- a/cli/tek.rs +++ b/cli/tek.rs @@ -1,5 +1,5 @@ pub use tek::*; -pub(crate) use clap::{self, Parser, Subcommand}; +pub(crate) use clap::{self, Parser}; /// Application entrypoint. pub fn main () -> Usually<()> { TekCli::parse().run()