From 866d88c8ec3f43436e1e6907590501e108091c02 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Thu, 24 Apr 2025 21:48:49 +0300 Subject: [PATCH] rename time modules --- crates/app/src/api.rs | 33 ++++++++++--------- crates/cli/tek.rs | 2 +- crates/sampler/sampler_scratch.rs | 14 +++++++- crates/time/src/lib.rs | 20 +++++------ crates/time/src/{clock.rs => time_clock.rs} | 0 crates/time/src/{moment.rs => time_moment.rs} | 0 .../src/{note_duration.rs => time_note.rs} | 0 crates/time/src/{perf.rs => time_perf.rs} | 0 crates/time/src/{pulse.rs => time_pulse.rs} | 0 .../{sample_count.rs => time_sample_count.rs} | 0 .../{sample_rate.rs => time_sample_rate.rs} | 0 .../src/{timebase.rs => time_timebase.rs} | 0 crates/time/src/{unit.rs => time_unit.rs} | 0 .../time/src/{microsecond.rs => time_usec.rs} | 0 14 files changed, 41 insertions(+), 28 deletions(-) rename crates/time/src/{clock.rs => time_clock.rs} (100%) rename crates/time/src/{moment.rs => time_moment.rs} (100%) rename crates/time/src/{note_duration.rs => time_note.rs} (100%) rename crates/time/src/{perf.rs => time_perf.rs} (100%) rename crates/time/src/{pulse.rs => time_pulse.rs} (100%) rename crates/time/src/{sample_count.rs => time_sample_count.rs} (100%) rename crates/time/src/{sample_rate.rs => time_sample_rate.rs} (100%) rename crates/time/src/{timebase.rs => time_timebase.rs} (100%) rename crates/time/src/{unit.rs => time_unit.rs} (100%) rename crates/time/src/{microsecond.rs => time_usec.rs} (100%) diff --git a/crates/app/src/api.rs b/crates/app/src/api.rs index dba69d6a..72edce2a 100644 --- a/crates/app/src/api.rs +++ b/crates/app/src/api.rs @@ -1,22 +1,23 @@ use crate::*; view!(TuiOut: |self: Tek| self.size.of(View(self, self.view)); { - //":inputs" => self.view_inputs().boxed(), - //":outputs" => self.view_outputs().boxed(), - //":scene-add" => self.view_scene_add().boxed(), - //":scenes" => self.view_scenes().boxed(), - //":tracks" => self.view_tracks().boxed(), - ":nil" => Box::new("nil"), - ":transport" => self.view_transport().boxed(), - ":arranger" => ArrangerView::new(self).boxed(), - ":editor" => self.editor.as_ref() - .map(|e|Bsp::s(Bsp::e(e.clip_status(), e.edit_status()), e)) - .boxed(), - ":sample" => ().boxed(),//self.view_sample(self.is_editing()).boxed(), - ":sampler" => ().boxed(),//self.view_sampler(self.is_editing(), &self.editor).boxed(), - //":samples-grid" => SamplerView::new(self).boxed(), - ":status" => self.view_status().boxed(), - ":pool" => self.pool.as_ref() + ":nil" => + Box::new("nil"), + ":transport" => + self.view_transport().boxed(), + ":arranger" => + ArrangerView::new(self).boxed(), + ":editor" => + self.editor.as_ref() + .map(|e|Bsp::s(Bsp::e(e.clip_status(), e.edit_status()), e)) + .boxed(), + ":sample" => + ().boxed(),//self.view_sample(self.is_editing()).boxed(), + ":sampler" => + ().boxed(),//self.view_sampler(self.is_editing(), &self.editor).boxed(), + ":status" => + self.view_status().boxed(), + ":pool" => self.pool.as_ref() .map(|pool|Fixed::x(self.w_sidebar(), PoolView(self.is_editing(), pool))) .boxed(), }); diff --git a/crates/cli/tek.rs b/crates/cli/tek.rs index d87c44de..3e2a3524 100644 --- a/crates/cli/tek.rs +++ b/crates/cli/tek.rs @@ -129,7 +129,7 @@ impl Cli { keys_mix: SourceIter(include_str!("./edn/arranger_keys_mix.edn")), tracks: match mode { Mode::Sequencer => vec![Track::default()], - Mode::Groovebox => vec![Track { + Mode::Groovebox | Mode::Sampler => vec![Track { devices: vec![ Device::boxed(Sampler::new( jack, diff --git a/crates/sampler/sampler_scratch.rs b/crates/sampler/sampler_scratch.rs index a36805f6..82009355 100644 --- a/crates/sampler/sampler_scratch.rs +++ b/crates/sampler/sampler_scratch.rs @@ -1,4 +1,16 @@ - +//handle!(TuiIn: |self: Sampler, input|SamplerCommand::execute_with_state(self, input.event())); +//input_to_command!(SamplerCommand: |state: Sampler, input: Event|match state.mode{ + //Some(SamplerMode::Import(..)) => Self::Import( + //FileBrowserCommand::input_to_command(state, input)? + //), + //_ => match input { + //// load sample + //kpat!(Shift-Char('L')) => Self::Import(FileBrowserCommand::Begin), + //kpat!(KeyCode::Up) => Self::Select(state.note_pos().overflowing_add(1).0.min(127)), + //kpat!(KeyCode::Down) => Self::Select(state.note_pos().overflowing_sub(1).0.min(127)), + //_ => return None + //} +//}); //impl Handle for AddSampleModal { //fn handle (&mut self, from: &TuiIn) -> Perhaps { //if from.handle_keymap(self, KEYMAP_ADD_SAMPLE)? { diff --git a/crates/time/src/lib.rs b/crates/time/src/lib.rs index 281b0419..e2214ed2 100644 --- a/crates/time/src/lib.rs +++ b/crates/time/src/lib.rs @@ -1,13 +1,13 @@ -mod clock; pub use self::clock::*; -mod microsecond; pub use self::microsecond::*; -mod moment; pub use self::moment::*; -mod note_duration; pub use self::note_duration::*; -mod perf; pub use self::perf::*; -mod pulse; pub use self::pulse::*; -mod sample_count; pub use self::sample_count::*; -mod sample_rate; pub use self::sample_rate::*; -mod timebase; pub use self::timebase::*; -mod unit; pub use self::unit::*; +mod time_clock; pub use self::time_clock::*; +mod time_moment; pub use self::time_moment::*; +mod time_note; pub use self::time_note::*; +mod time_perf; pub use self::time_perf::*; +mod time_pulse; pub use self::time_pulse::*; +mod time_sample_count; pub use self::time_sample_count::*; +mod time_sample_rate; pub use self::time_sample_rate::*; +mod time_timebase; pub use self::time_timebase::*; +mod time_unit; pub use self::time_unit::*; +mod time_usec; pub use self::time_usec::*; pub(crate) use ::tek_jack::{*, jack::{*, contrib::*}}; pub(crate) use std::sync::{Arc, RwLock, atomic::{AtomicBool, AtomicUsize, Ordering::*}}; diff --git a/crates/time/src/clock.rs b/crates/time/src/time_clock.rs similarity index 100% rename from crates/time/src/clock.rs rename to crates/time/src/time_clock.rs diff --git a/crates/time/src/moment.rs b/crates/time/src/time_moment.rs similarity index 100% rename from crates/time/src/moment.rs rename to crates/time/src/time_moment.rs diff --git a/crates/time/src/note_duration.rs b/crates/time/src/time_note.rs similarity index 100% rename from crates/time/src/note_duration.rs rename to crates/time/src/time_note.rs diff --git a/crates/time/src/perf.rs b/crates/time/src/time_perf.rs similarity index 100% rename from crates/time/src/perf.rs rename to crates/time/src/time_perf.rs diff --git a/crates/time/src/pulse.rs b/crates/time/src/time_pulse.rs similarity index 100% rename from crates/time/src/pulse.rs rename to crates/time/src/time_pulse.rs diff --git a/crates/time/src/sample_count.rs b/crates/time/src/time_sample_count.rs similarity index 100% rename from crates/time/src/sample_count.rs rename to crates/time/src/time_sample_count.rs diff --git a/crates/time/src/sample_rate.rs b/crates/time/src/time_sample_rate.rs similarity index 100% rename from crates/time/src/sample_rate.rs rename to crates/time/src/time_sample_rate.rs diff --git a/crates/time/src/timebase.rs b/crates/time/src/time_timebase.rs similarity index 100% rename from crates/time/src/timebase.rs rename to crates/time/src/time_timebase.rs diff --git a/crates/time/src/unit.rs b/crates/time/src/time_unit.rs similarity index 100% rename from crates/time/src/unit.rs rename to crates/time/src/time_unit.rs diff --git a/crates/time/src/microsecond.rs b/crates/time/src/time_usec.rs similarity index 100% rename from crates/time/src/microsecond.rs rename to crates/time/src/time_usec.rs