Move midi functionality to separate crate

PikminGuts92 · Mar 27, 2024 · 6e03f81 · 6e03f81
1 parent 2263335
commit 6e03f81
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/core/grim/Cargo.toml b/core/grim/Cargo.toml
@@ -13,13 +13,13 @@ gltf = { workspace = true, optional = true }
 gltf-json = { workspace = true, optional = true }
 grim_gltf = { path = "../grim_gltf", optional = true }
 grim_macros = { path = "../grim_macros" }
+grim_midi = {path = "../grim_midi", optional = true }
 grim_traits = { path = "../grim_traits" }
 half = { version = "2.3.1", default-features = false }
 image = { version = "0.24.8", default-features = false, features = [ "dxt", "png" ] }
 itertools = { workspace = true }
 lazy_static = { workspace = true }
 log = { workspace = true }
-midly = { version = "0.5.3", optional = true }
 nalgebra = { version = "0.32.3", optional = true }
 nom = "7.1.3"
 # pyo3 = { version = "0.17.3", optional = true, features = [ "extension-module" ] }
@@ -37,7 +37,7 @@ rstest = "0.18.2"
 [features]
 audio = [ "bitstream-io", "fon", "wav" ]
 audio_experimental = []
-midi = [ "midly" ]
+midi = [ "grim_midi" ]
 model = [ "gltf", "gltf-json", "grim_gltf", "nalgebra", "serde" ]
 python = [ "pyo3" ]
 

diff --git a/core/grim/src/lib.rs b/core/grim/src/lib.rs
@@ -2,7 +2,9 @@ pub mod ark;
 #[cfg(feature = "audio")] pub mod audio;
 pub mod dta;
 pub mod io;
-#[cfg(feature = "midi")] pub mod midi;
+#[cfg(feature = "midi")] pub mod midi {
+    pub use grim_midi::*;
+}
 #[cfg(feature = "model")] pub mod model;
 pub mod scene;
 mod system;

diff --git a/core/grim_midi/Cargo.toml b/core/grim_midi/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "grim_midi"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+
+[dependencies]
+midly = { version = "0.5.3" }
+
+[dev-dependencies]
+rstest = "0.18.2"
+
+[lints]
+workspace = true
diff --git a/core/grim/src/midi/io.rs → core/grim_midi/src/io.rs b/core/grim/src/midi/io.rs → core/grim_midi/src/io.rs
diff --git a/core/grim/src/midi/mod.rs → core/grim_midi/src/lib.rs b/core/grim/src/midi/mod.rs → core/grim_midi/src/lib.rs
diff --git a/core/grim/src/midi/reader.rs → core/grim_midi/src/reader.rs b/core/grim/src/midi/reader.rs → core/grim_midi/src/reader.rs