flattened tengri

Cargo.lock

@@ -2666,32 +2666,6 @@ dependencies = [
 [[package]]
 name = "tengri"
 version = "0.14.0"
-dependencies = [
- "dizzle",
- "tengri_input",
- "tengri_output",
- "tengri_tui",
-]
-
-[[package]]
-name = "tengri_input"
-version = "0.14.0"
-dependencies = [
- "dizzle",
-]
-
-[[package]]
-name = "tengri_output"
-version = "0.14.0"
-dependencies = [
- "atomic_float",
- "dizzle",
- "quanta",
-]
-
-[[package]]
-name = "tengri_tui"
-version = "0.14.0"
 dependencies = [
  "atomic_float",
  "better-panic",
@@ -2701,8 +2675,6 @@ dependencies = [
  "quanta",
  "rand 0.8.5",
  "ratatui",
- "tengri_input",
- "tengri_output",
  "unicode-width 0.2.0",
 ]
 

app/tek.rs

@@ -8,6 +8,60 @@
            type_alias_impl_trait,
            type_changing_struct_update)]
 
+#[allow(unused)] pub(crate) use ::{
+    std::{
+        cmp::Ord,
+        collections::BTreeMap,
+        error::Error,
+        ffi::OsString,
+        fmt::{Write, Debug, Formatter},
+        fs::File,
+        ops::{Add, Sub, Mul, Div, Rem},
+        path::{Path, PathBuf},
+        sync::{Arc, RwLock, atomic::{AtomicBool, AtomicUsize, Ordering::Relaxed}},
+        thread::{spawn, JoinHandle},
+    },
+};
+extern crate xdg;
+pub(crate) use ::xdg::BaseDirectories;
+pub extern crate atomic_float;
+pub(crate) use atomic_float::AtomicF64;
+pub extern crate jack;
+pub(crate) use ::jack::{*, contrib::{*, ClosureProcessHandler}};
+pub extern crate midly;
+pub(crate) use ::midly::{Smf, TrackEventKind, MidiMessage, Error as MidiError, num::*, live::*};
+pub extern crate tengri;
+pub(crate) use tengri::{
+    *,
+    ratatui::{
+        self,
+        prelude::{Rect, Style, Stylize, Buffer, Modifier, buffer::Cell, Color::{self, *}},
+        widgets::{Widget, canvas::{Canvas, Line}},
+    },
+    crossterm::{
+        self,
+        event::{Event, KeyEvent, KeyCode::{self, *}},
+    },
+};
+#[cfg(feature = "sampler")] pub(crate) use symphonia::{
+    core::{
+        formats::Packet,
+        codecs::{Decoder, CODEC_TYPE_NULL},
+        //errors::Error as SymphoniaError,
+        io::MediaSourceStream,
+        probe::Hint,
+        audio::SampleBuffer,
+    },
+    default::get_codecs,
+};
+#[cfg(feature = "lv2_gui")] use ::winit::{
+    application::ApplicationHandler,
+    event::WindowEvent,
+    event_loop::{ActiveEventLoop, ControlFlow, EventLoop},
+    window::{Window, WindowId},
+    platform::x11::EventLoopBuilderExtX11
+};
+
 #[cfg(test)] mod tek_test;
 
 mod tek_struct;
@@ -26,64 +80,6 @@ pub(crate) use ConnectScope::*;
 pub(crate) use ConnectStatus::*;
 pub(crate) use JackState::*;
 
-#[allow(unused)] pub(crate) use ::{
-    std::{
-        cmp::Ord,
-        collections::BTreeMap,
-        error::Error,
-        ffi::OsString,
-        fmt::{Write, Debug, Formatter},
-        fs::File,
-        ops::{Add, Sub, Mul, Div, Rem},
-        path::{Path, PathBuf},
-        sync::{Arc, RwLock, atomic::{AtomicBool, AtomicUsize, Ordering::Relaxed}},
-        thread::{spawn, JoinHandle},
-    },
-    xdg::BaseDirectories,
-    atomic_float::*,
-    tengri::tui::ratatui::{
-        self,
-        prelude::{Rect, Style, Stylize, Buffer, Modifier, buffer::Cell, Color::{self, *}},
-        widgets::{Widget, canvas::{Canvas, Line}},
-    },
-    tengri::tui::crossterm::{
-        self,
-        event::{Event, KeyEvent, KeyCode::{self, *}},
-    },
-};
-
-pub extern crate tengri;
-pub(crate) use tengri::{*, input::*, output::*, tui::*};
-
-pub extern crate jack;
-pub(crate) use ::jack::{*, contrib::{*, ClosureProcessHandler}};
-
-pub extern crate midly;
-pub(crate) use ::midly::{Smf, TrackEventKind, MidiMessage, Error as MidiError, num::*, live::*};
-
-pub extern crate atomic_float;
-pub(crate) use atomic_float::AtomicF64;
-
-#[cfg(feature = "sampler")] pub(crate) use symphonia::{
-    core::{
-        formats::Packet,
-        codecs::{Decoder, CODEC_TYPE_NULL},
-        //errors::Error as SymphoniaError,
-        io::MediaSourceStream,
-        probe::Hint,
-        audio::SampleBuffer,
-    },
-    default::get_codecs,
-};
-
-#[cfg(feature = "lv2_gui")] use ::winit::{
-    application::ApplicationHandler,
-    event::WindowEvent,
-    event_loop::{ActiveEventLoop, ControlFlow, EventLoop},
-    window::{Window, WindowId},
-    platform::x11::EventLoopBuilderExtX11
-};
-
 /// Command-line entrypoint.
 #[cfg(feature = "cli")] pub fn main () -> Usually<()> {
     use clap::Parser;

bacon.toml

@@ -10,25 +10,25 @@ l = "job:clippy"
 [jobs.check]
 command = ["cargo", "check"]
 need_stdout = false
-watch = ["deps", "engine", "device", "app"]
+watch = ["dizzle", "tengri", "app"]
 [jobs.check-all]
 command = ["cargo", "check", "--all-targets"]
 need_stdout = false
-watch = ["deps", "engine", "device", "app"]
+watch = ["dizzle", "tengri", "app"]
 [jobs.clippy]
 command = ["cargo", "clippy"]
 need_stdout = false
-watch = ["deps", "engine", "device", "app"]
+watch = ["dizzle", "tengri", "app"]
 [jobs.clippy-all]
 command = ["cargo", "clippy", "--all-targets"]
 need_stdout = false
-watch = ["deps", "engine", "device", "app"]
+watch = ["dizzle", "tengri", "app"]
 [jobs.test]
 command = ["cargo", "test", "--workspace", "--exclude", "jack"]
 need_stdout = true
-watch = ["deps", "engine", "device", "app"]
+watch = ["dizzle", "tengri", "app"]
 [jobs.nextest]
-watch = ["deps", "engine", "device", "app"]
+watch = ["dizzle", "tengri", "app"]
 command = [
     "cargo", "nextest", "run",
     "--hide-progress-bar", "--failure-output", "final"
@@ -51,14 +51,14 @@ need_stdout = true
 allow_warnings = true
 background = true
 [jobs.run-long]
-watch = ["deps", "engine", "device", "app"]
+watch = ["dizzle", "tengri", "app"]
 command = [ "cargo", "run", ]
 need_stdout = true
 allow_warnings = true
 background = false
 on_change_strategy = "kill_then_restart"
 [jobs.ex]
-watch = ["deps", "engine", "device", "app"]
+watch = ["dizzle", "tengri", "app"]
 command = ["cargo", "run", "--example"]
 need_stdout = true
 allow_warnings = true

tengri

@@ -1 +1 @@
-Subproject commit b4ebdb8ff80941f45647b628ac2d7b21969f3241
+Subproject commit 5d61cc6c5f975bacd20e1a90b9ad583b991f9204