From ba56c1909d5fc9e44ded659b05903d462f15e23c Mon Sep 17 00:00:00 2001
From: unspeaker <hora.nqma@protonmail.com>
Date: Fri, 27 Dec 2024 21:29:28 +0100
Subject: [PATCH] flatten modules a little more

---
 crates/tek/src/lib.rs                         | 35 ++++++++-----------
 crates/tek/src/midi.rs                        |  2 ++
 .../phrase_editor.rs => midi/midi_editor.rs}  |  0
 crates/tek/src/{tui => }/pool.rs              |  0
 .../tek/src/{tui => }/pool/phrase_length.rs   |  0
 .../tek/src/{tui => }/pool/phrase_rename.rs   |  0
 crates/tek/src/{tui => }/status.rs            |  0
 .../src/{tui => }/status/status_arranger.rs   |  0
 .../tek/src/{tui => }/status/status_edit.rs   |  0
 .../src/{tui => }/status/status_groovebox.rs  |  0
 .../src/{tui => }/status/status_sequencer.rs  |  0
 crates/tek/src/tui.rs                         |  9 ++---
 12 files changed, 19 insertions(+), 27 deletions(-)
 rename crates/tek/src/{tui/phrase_editor.rs => midi/midi_editor.rs} (100%)
 rename crates/tek/src/{tui => }/pool.rs (100%)
 rename crates/tek/src/{tui => }/pool/phrase_length.rs (100%)
 rename crates/tek/src/{tui => }/pool/phrase_rename.rs (100%)
 rename crates/tek/src/{tui => }/status.rs (100%)
 rename crates/tek/src/{tui => }/status/status_arranger.rs (100%)
 rename crates/tek/src/{tui => }/status/status_edit.rs (100%)
 rename crates/tek/src/{tui => }/status/status_groovebox.rs (100%)
 rename crates/tek/src/{tui => }/status/status_sequencer.rs (100%)

diff --git a/crates/tek/src/lib.rs b/crates/tek/src/lib.rs
index 2518e788..be8099fb 100644
--- a/crates/tek/src/lib.rs
+++ b/crates/tek/src/lib.rs
@@ -7,45 +7,40 @@ pub mod time; pub(crate) use self::time::*;
 
 pub mod space; pub(crate) use self::space::*;
 
-pub mod tui;
-pub(crate) use self::tui::*;
+pub mod tui; pub(crate) use self::tui::*;
 pub use tui::*;
 
-pub mod jack;
-pub(crate) use self::jack::*;
+pub mod jack; pub(crate) use self::jack::*;
 pub use self::jack::*;
 
-pub mod midi;
-pub(crate) use self::midi::*;
+pub mod midi; pub(crate) use self::midi::*;
 
-pub mod transport;
-pub(crate) use self::transport::*;
+pub mod transport; pub(crate) use self::transport::*;
 pub use self::transport::TransportTui;
 
-pub mod sequencer;
-pub(crate) use self::sequencer::*;
+pub mod sequencer; pub(crate) use self::sequencer::*;
 pub use self::sequencer::SequencerTui;
 
-pub mod arranger;
-pub(crate) use self::arranger::*;
+pub mod arranger; pub(crate) use self::arranger::*;
 pub use self::arranger::ArrangerTui;
 
-mod sampler;
-pub(crate) use self::sampler::*;
+pub mod sampler; pub(crate) use self::sampler::*;
 pub use self::sampler::{SamplerTui, Sampler, Sample, Voice};
 
-mod mixer;
-pub(crate) use self::mixer::*;
+pub mod mixer; pub(crate) use self::mixer::*;
 pub use self::mixer::{Mixer, MixerTrack, MixerTrackDevice};
 
-pub mod plugin;
-pub(crate) use self::plugin::*;
+pub mod plugin; pub(crate) use self::plugin::*;
 pub use self::plugin::*;
 
-pub mod groovebox;
-pub(crate) use self::groovebox::*;
+pub mod groovebox; pub(crate) use self::groovebox::*;
 pub use self::groovebox::GrooveboxTui;
 
+pub mod pool; pub(crate) use self::pool::*;
+pub use self::pool::PoolModel;
+
+pub mod status; pub(crate) use self::status::*;
+
 pub use ::better_panic; pub(crate) use better_panic::{Settings, Verbosity};
 
 pub use ::atomic_float; pub(crate) use atomic_float::*;
diff --git a/crates/tek/src/midi.rs b/crates/tek/src/midi.rs
index 7e97a594..c242ed61 100644
--- a/crates/tek/src/midi.rs
+++ b/crates/tek/src/midi.rs
@@ -11,6 +11,8 @@ pub(crate) mod midi_range;  pub(crate) use midi_range::*;
 pub(crate) mod midi_point;  pub(crate) use midi_point::*;
 pub(crate) mod midi_view;   pub(crate) use midi_view::*;
 
+pub(crate) mod midi_editor; pub(crate) use midi_editor::*;
+
 /// Trait for thing that may receive MIDI.
 pub trait HasMidiIns {
     fn midi_ins (&self) -> &Vec<Port<MidiIn>>;
diff --git a/crates/tek/src/tui/phrase_editor.rs b/crates/tek/src/midi/midi_editor.rs
similarity index 100%
rename from crates/tek/src/tui/phrase_editor.rs
rename to crates/tek/src/midi/midi_editor.rs
diff --git a/crates/tek/src/tui/pool.rs b/crates/tek/src/pool.rs
similarity index 100%
rename from crates/tek/src/tui/pool.rs
rename to crates/tek/src/pool.rs
diff --git a/crates/tek/src/tui/pool/phrase_length.rs b/crates/tek/src/pool/phrase_length.rs
similarity index 100%
rename from crates/tek/src/tui/pool/phrase_length.rs
rename to crates/tek/src/pool/phrase_length.rs
diff --git a/crates/tek/src/tui/pool/phrase_rename.rs b/crates/tek/src/pool/phrase_rename.rs
similarity index 100%
rename from crates/tek/src/tui/pool/phrase_rename.rs
rename to crates/tek/src/pool/phrase_rename.rs
diff --git a/crates/tek/src/tui/status.rs b/crates/tek/src/status.rs
similarity index 100%
rename from crates/tek/src/tui/status.rs
rename to crates/tek/src/status.rs
diff --git a/crates/tek/src/tui/status/status_arranger.rs b/crates/tek/src/status/status_arranger.rs
similarity index 100%
rename from crates/tek/src/tui/status/status_arranger.rs
rename to crates/tek/src/status/status_arranger.rs
diff --git a/crates/tek/src/tui/status/status_edit.rs b/crates/tek/src/status/status_edit.rs
similarity index 100%
rename from crates/tek/src/tui/status/status_edit.rs
rename to crates/tek/src/status/status_edit.rs
diff --git a/crates/tek/src/tui/status/status_groovebox.rs b/crates/tek/src/status/status_groovebox.rs
similarity index 100%
rename from crates/tek/src/tui/status/status_groovebox.rs
rename to crates/tek/src/status/status_groovebox.rs
diff --git a/crates/tek/src/tui/status/status_sequencer.rs b/crates/tek/src/status/status_sequencer.rs
similarity index 100%
rename from crates/tek/src/tui/status/status_sequencer.rs
rename to crates/tek/src/status/status_sequencer.rs
diff --git a/crates/tek/src/tui.rs b/crates/tek/src/tui.rs
index 4b703916..726f6ce7 100644
--- a/crates/tek/src/tui.rs
+++ b/crates/tek/src/tui.rs
@@ -14,13 +14,8 @@ mod tui_border; pub(crate) use self::tui_border::*;
 
 ///////////////////////////////////////////////////////
 
-////////////////////////////////////////////////////////
-
-pub mod pool;          pub(crate) use self::pool::*;
-pub mod phrase_editor; pub(crate) use self::phrase_editor::*;
-pub mod status;        pub(crate) use self::status::*;
-pub mod file_browser;  pub(crate) use self::file_browser::*;
-pub mod piano_h;       pub(crate) use self::piano_h::*; 
+pub mod file_browser; pub(crate) use self::file_browser::*;
+pub mod piano_h;      pub(crate) use self::piano_h::*; 
 
 ////////////////////////////////////////////////////////