flatten workspace into 1 crate

Cargo.lock

@@ -261,15 +261,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.5"
@@ -320,16 +311,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "ctor"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
-dependencies = [
- "quote",
- "syn",
-]
-
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -462,10 +443,7 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 name = "jack"
 version = "0.13.0"
 dependencies = [
- "approx",
  "bitflags 2.6.0",
- "crossbeam-channel",
- "ctor",
  "jack-sys",
  "lazy_static",
  "libc",
@@ -1286,6 +1264,7 @@ dependencies = [
  "atomic_float",
  "backtrace",
  "better-panic",
+ "clap",
  "clojure-reader",
  "crossterm",
  "jack",
@@ -1302,22 +1281,6 @@ dependencies = [
  "wavers",
 ]
 
-[[package]]
-name = "tek_cli"
-version = "0.2.0"
-dependencies = [
- "clap",
- "tek",
-]
-
-[[package]]
-name = "tek_edn"
-version = "0.2.0"
-dependencies = [
- "clojure-reader",
- "tek",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.69"

Cargo.toml

@@ -1,10 +1,67 @@
-[workspace]
-resolver = "2"
-members = [
-  "crates/tek",
-  "crates/cli",
-  "crates/edn",
-]
+[package]
+name = "tek"
+edition = "2021"
+version = "0.2.0"
+
+[dependencies]
+#no_deadlocks = "1.3.2"
+#vst3 = "0.1.0"
+atomic_float = "1.0.0"
+backtrace = "0.3.72"
+better-panic = "0.3.0"
+clojure-reader = "0.1.0"
+crossterm = "0.27"
+jack = { path = "./rust-jack" }
+livi = "0.7.4"
+midly = "0.5"
+once_cell = "1.19.0"
+palette = { version = "0.7.6", features = [ "random" ] }
+quanta = "0.12.3"
+rand = "0.8.5"
+ratatui = { version = "0.26.3", features = [ "unstable-widget-ref", "underline-color" ] }
+#suil-rs = { path = "../suil" }
+symphonia = { version = "0.5.4", features = [ "all" ] }
+toml = "0.8.12"
+uuid = { version = "1.10.0", features = [ "v4" ] }
+#vst = "0.4.0"
+wavers = "1.4.3"
+#winit = { version = "0.30.4", features = [ "x11" ] }
+clap = { version = "4.5.4", features = [ "derive" ] }
+
+[[bin]]
+name = "tek_arranger"
+path = "bin/cli_arranger.rs"
+
+[[bin]]
+name = "tek_sequencer"
+path = "bin/cli_sequencer.rs"
+
+[[bin]]
+name = "tek_groovebox"
+path = "bin/cli_groovebox.rs"
+
+[[bin]]
+name = "tek_transport"
+path = "bin/cli_transport.rs"
+
+[[bin]]
+name = "tek_sampler"
+path = "bin/cli_sampler.rs"
+
+#[[bin]]
+#name = "tek_mixer"
+#path = "src/cli_mixer.rs"
+
+#[[bin]]
+#name = "tek_track"
+#path = "src/cli_track.rs"
+
+#[[bin]]
+#name = "tek_plugin"
+#path = "src/cli_plugin.rs"
+
+[lib]
+path = "src/lib.rs"
 
 [profile.release]
 lto = true

crates/cli/Cargo.toml

@@ -1,40 +0,0 @@
-[package]
-name    = "tek_cli"
-edition = "2021"
-version = "0.2.0"
-
-[dependencies]
-tek  = { path = "../tek" }
-clap = { version = "4.5.4", features = [ "derive" ] }
-
-[[bin]]
-name = "tek_arranger"
-path = "src/cli_arranger.rs"
-
-[[bin]]
-name = "tek_sequencer"
-path = "src/cli_sequencer.rs"
-
-[[bin]]
-name = "tek_groovebox"
-path = "src/cli_groovebox.rs"
-
-[[bin]]
-name = "tek_transport"
-path = "src/cli_transport.rs"
-
-[[bin]]
-name = "tek_sampler"
-path = "src/cli_sampler.rs"
-
-#[[bin]]
-#name = "tek_mixer"
-#path = "src/cli_mixer.rs"
-
-#[[bin]]
-#name = "tek_track"
-#path = "src/cli_track.rs"
-
-#[[bin]]
-#name = "tek_plugin"
-#path = "src/cli_plugin.rs"

crates/edn/Cargo.toml

@@ -1,8 +0,0 @@
-[package]
-name    = "tek_edn"
-edition = "2021"
-version = "0.2.0"
-
-[dependencies]
-tek = { path = "../tek" }
-clojure-reader = "0.1.0"

crates/tek/Cargo.toml

@@ -1,31 +0,0 @@
-[package]
-name = "tek"
-edition = "2021"
-version = "0.2.0"
-
-[dependencies]
-#no_deadlocks = "1.3.2"
-#vst3 = "0.1.0"
-atomic_float = "1.0.0"
-backtrace = "0.3.72"
-better-panic = "0.3.0"
-clojure-reader = "0.1.0"
-crossterm = "0.27"
-jack = { path = "../../rust-jack" }
-livi = "0.7.4"
-midly = "0.5"
-once_cell = "1.19.0"
-palette = { version = "0.7.6", features = [ "random" ] }
-quanta = "0.12.3"
-rand = "0.8.5"
-ratatui = { version = "0.26.3", features = [ "unstable-widget-ref", "underline-color" ] }
-#suil-rs = { path = "../suil" }
-symphonia = { version = "0.5.4", features = [ "all" ] }
-toml = "0.8.12"
-uuid = { version = "1.10.0", features = [ "v4" ] }
-#vst = "0.4.0"
-wavers = "1.4.3"
-#winit = { version = "0.30.4", features = [ "x11" ] }
-
-[lib]
-path = "src/lib.rs"

src/edn.rs

@@ -1,7 +1,6 @@
-#[allow(unused_imports)] use tek::{*, jack::*, plugin::*};
+use crate::*;
 use std::sync::{Arc, RwLock};
 use std::collections::BTreeMap;
-
 pub use clojure_reader::edn::Edn;
 //pub use clojure_reader::{edn::{read, Edn}, error::Error as EdnError};