Move neothesia-cli recorder to separate crate

.github/workflows/rust.yml

@@ -63,7 +63,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --release --no-default-features --features record
+          args: --release -p neothesia-cli
       - name: Chmod +x
         run: chmod +x target/release/neothesia-cli
       - name: zip binary

Cargo.toml

@@ -3,13 +3,21 @@ members = [
     "piano-math",
     "wgpu-jumpstart",
     "neothesia",
+    "neothesia-cli",
     "neothesia-pipelines",
     "midi-file",
     "midi-io",
 ]
 
+default-members = ["neothesia"]
+
 [workspace.dependencies]
 wgpu = "0.16.1"
 log = "0.4"
 bytemuck = { version = "1.5", features = ["derive"] }
-wgpu-jumpstart = { path = "./wgpu-jumpstart" }
+env_logger = "0.10"
+futures = "0.3"
+wgpu-jumpstart = { path = "./wgpu-jumpstart" }
+neothesia = { path = "./neothesia", default-features = false }
+midi-file = { path = "./midi-file" }
+piano-math = { path = "./piano-math" }

makefile

@@ -1,11 +1,11 @@
 build-app:
-	cargo build --release
+	cargo build --release --bin neothesia
 run-app:
-	cargo run --release
+	cargo run --release --bin neothesia
 
 check-recorder:
-	cargo check --no-default-features --features record
+	cargo check -p neothesia-cli
 build-recorder:
-	cargo build --release --no-default-features --features record
+	cargo build --release -p neothesia-cli
 run-recorder:
-	cargo run --release --no-default-features --bin neothesia-cli --features record -- $(file)
+	cargo run --release -p neothesia-cli -- $(file)

midi-io/Cargo.toml

@@ -4,4 +4,4 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-midir = "0.8"
+midir = "0.9"

neothesia-cli/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "neothesia-cli"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+# Download and compile ffmpeg
+build-ffmpeg = ["mpeg_encoder/build"]
+
+[dependencies]
+neothesia = { workspace = true }
+midi-file = { workspace = true }
+piano-math = { workspace = true }
+wgpu-jumpstart = { workspace = true }
+env_logger = { workspace = true }
+futures = { workspace = true }
+
+mpeg_encoder = { git = "https://github.com/PolyMeilex/mpeg_encoder_next.git" }

neothesia/src/bin/neothesia-cli.rs → neothesia-cli/src/main.rs

@@ -5,6 +5,7 @@ use neothesia::{
     render::{KeyboardRenderer, TextRenderer, WaterfallRenderer},
     Gpu, TransformUniform, Uniform,
 };
+use wgpu_jumpstart::wgpu;
 
 pub struct Recorder {
     gpu: Gpu,

neothesia/Cargo.toml

@@ -21,18 +21,15 @@ app = [
     "async-thread",
     "winit",
 ]
-record = ["mpeg_encoder"]
-# Download and compile ffmpeg
-build-ffmpeg = ["mpeg_encoder/build"]
 
 synth = []
 fluid-synth = ["synth", "cpal", "fluidlite"]
 oxi-synth = ["synth", "cpal", "oxisynth"]
 
 [dependencies]
-futures = "0.3"
+futures = { workspace = true }
 log = { workspace = true }
-env_logger = "0.10"
+env_logger = { workspace = true }
 fps_ticker = "1.0"
 ron = "0.8"
 serde = { version = "1.0", features = ["serde_derive"] }
@@ -44,7 +41,7 @@ wgpu_glyph = "0.20.0"
 wgpu-jumpstart = { workspace = true }
 
 neothesia-pipelines = { path = "../neothesia-pipelines" }
-piano-math = { path = "../piano-math" }
+piano-math = { workspace = true }
 
 # App Deps
 
@@ -56,7 +53,7 @@ async-thread = { version = "0.1", optional = true }
 fluidlite = { version = "0.2", features = ["builtin"], optional = true }
 oxisynth = { version = "0.0.3", optional = true }
 
-midi-file = { path = "../midi-file" }
+midi-file = { workspace = true }
 midi-io = { path = "../midi-io", optional = true }
 
 iced_core = { git = "https://github.com/iced-rs/iced.git", rev = "b5f102c55835cf42427f9f8672634e81a5d724f6", optional = true }
@@ -72,15 +69,9 @@ iced_widget = { git = "https://github.com/iced-rs/iced.git", rev = "b5f102c55835
 
 # Recorder Deps
 
-mpeg_encoder = { git = "https://github.com/PolyMeilex/mpeg_encoder_next.git", optional = true }
-
 [target.'cfg(target_os = "macos")'.dependencies]
 objc = "0.2"
 
-[[bin]]
-name = "neothesia-cli"
-required-features = ["record"]
-
 [[bin]]
 name = "neothesia"
 required-features = ["app"]