rename time modules

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(),
 });

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,

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<TuiIn> for AddSampleModal {
     //fn handle (&mut self, from: &TuiIn) -> Perhaps<bool> {
         //if from.handle_keymap(self, KEYMAP_ADD_SAMPLE)? {

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::*}};