cleanup main

src/main.rs

@@ -1,45 +1,22 @@
+//#[global_allocator]
+//static A: rlsf::SmallGlobalTlsf = rlsf::SmallGlobalTlsf::new();
 //#![feature(fn_traits)]
 //#![feature(unboxed_closures)]
 #![allow(macro_expanded_macro_exports_accessed_by_absolute_paths)]
 
-//#[global_allocator]
-//static A: rlsf::SmallGlobalTlsf = rlsf::SmallGlobalTlsf::new();
-
 extern crate clap;
 extern crate jack as _jack;
 extern crate crossterm;
 
-mod cli;
-mod config;
-mod control;
-mod core;
-mod model;
-mod view;
-mod jack;
-mod edn;
+mod core; crate::core::submod! { cli config control model view jack edn }
 
 use crate::{core::*, model::*};
 
 /// Application entrypoint.
 pub fn main () -> Usually<()> {
-    let mut app = App::new()?;
-    app
-        .connect_to_midi_ins(&["nanoKEY Studio.*capture.*"])?
+    let mut init = App::new()?;
+    init.connect_to_midi_ins(&["nanoKEY Studio.*capture.*"])?
         .connect_to_audio_outs(&["Komplete.+:playback_FL", "Komplete.+:playback_FR"])?
         .load_edn(include_str!("../demos/project.edn"))?;
-    run(app.activate()?);
-    // Start main loop
-    //App::new()?.run(Some(|app: Arc<RwLock<App>>|{
-        //let mut state = app.write().unwrap();
-        //// Start JACK and setup device graph
-        //let jack        = jack_run("tek", &app)?;
-        //let client      = jack.as_client();
-        //state.transport = Some(client.transport());
-        //state.midi_in   = Some(client.register_port("midi-in", MidiIn)?);
-        //state.jack = Some(jack);
-        //// Load project
-        //state.load_edn(include_str!("../demos/project.edn"))?;
-        //Ok(())
-    //}))
-    Ok(())
+    init.activate().map(|app|run(app)).map(|_|())
 }

src/view/layout.rs

@@ -1,3 +1,5 @@
+//#![feature(fn_traits)]
+//#![feature(unboxed_closures)]
 use crate::core::*;
 
 pub trait Modal<T>: Device {