wip: refactor pt.20: 44 errors

crates/tek_cli/src/cli_arranger.rs

@@ -1,6 +1,8 @@
-include!("lib.rs");
 use tek_core::clap::{self, Parser};
-pub fn main () -> Usually<()> { ArrangerCli::parse().run() }
+
+pub fn main () -> Usually<()> {
+    ArrangerCli::parse().run()
+}
 
 /// Parses CLI arguments to the `tek_arranger` invocation.
 #[derive(Debug, Parser)]

crates/tek_cli/src/cli_mixer.rs

@@ -1,13 +1,16 @@
-//! Multi-track mixer
-include!("lib.rs");
 use tek_core::clap::{self, Parser};
-pub fn main () -> Usually<()> { MixerCli::parse().run() }
+
+pub fn main () -> Usually<()> {
+    MixerCli::parse().run()
+}
+
 #[derive(Debug, Parser)] #[command(version, about, long_about = None)] pub struct MixerCli {
     /// Name of JACK client
     #[arg(short, long)] name: Option<String>,
     /// Number of tracks
     #[arg(short, long)] channels: Option<usize>,
 }
+
 impl MixerCli {
     fn run (&self) -> Usually<()> {
         Tui::run(JackClient::new("tek_mixer")?.activate_with(|jack|{

crates/tek_cli/src/cli_plugin.rs

@@ -1,13 +1,16 @@
-//! Plugin host
-include!("lib.rs");
 use tek_core::clap::{self, Parser};
-pub fn main () -> Usually<()> { PluginCli::parse().run() }
+
+pub fn main () -> Usually<()> {
+    PluginCli::parse().run()
+}
+
 #[derive(Debug, Parser)] #[command(version, about, long_about = None)] pub struct PluginCli {
     /// Name of JACK client
     #[arg(short, long)] name: Option<String>,
     /// Path to plugin
     #[arg(short, long)] path: Option<String>,
 }
+
 impl PluginCli {
     fn run (&self) -> Usually<()> {
         Tui::run(JackClient::new("tek_plugin")?.activate_with(|jack|{

crates/tek_cli/src/cli_sampler.rs

@@ -1,13 +1,16 @@
-//! Sample player
-include!("lib.rs");
 use tek_core::clap::{self, Parser};
-pub fn main () -> Usually<()> { SamplerCli::parse().run() }
+
+pub fn main () -> Usually<()> {
+    SamplerCli::parse().run()
+}
+
 #[derive(Debug, Parser)] #[command(version, about, long_about = None)] pub struct SamplerCli {
     /// Name of JACK client
     #[arg(short, long)] name: Option<String>,
     /// Path to plugin
     #[arg(short, long)] path: Option<String>,
 }
+
 impl SamplerCli {
     fn run (&self) -> Usually<()> {
         Tui::run(JackClient::new("tek_sampler")?.activate_with(|jack|{

crates/tek_cli/src/cli_sequencer.rs

@@ -1,7 +1,8 @@
-//! Phrase editor.
-include!("lib.rs");
 use tek_core::clap::{self, Parser};
-pub fn main () -> Usually<()> { SequencerCli::parse().run() }
+
+pub fn main () -> Usually<()> {
+    SequencerCli::parse().run()
+}
 
 #[derive(Debug, Parser)]
 #[command(version, about, long_about = None)]

crates/tek_cli/src/cli_transport.rs

@@ -1,10 +1,7 @@
-include!("lib.rs");
+use tek_core::clap::{self, Parser};
+
 /// Application entrypoint.
 pub fn main () -> Usually<()> {
-    Tui::run(JackClient::new("tek_transport")?.activate_with(|jack|{
-        let mut transport = TransportView::new(jack, None);
-        transport.focused = true;
-        Ok(transport)
-    })?)?;
+    Tui::run(JackClient::new("tek_transport")?.activate_with(TransportApp::run)?)?
     Ok(())
 }