Reorganized code after rebase

Author: catilac

Cargo.lock

@@ -5,8 +5,8 @@ edition = "2024"
 
 [dependencies]
 bevy = { workspace = true }
+processing_core = { workspace = true }
 bevy_midi = { git = "https://github.com/BlackPhlox/bevy_midi", branch = "latest" }
 
-
 [lints]
 workspace = true

crates/processing_midi/Cargo.toml

@@ -1,23 +1,45 @@
 use bevy::prelude::*;
 use bevy_midi::prelude::*;
 
+use processing_core::error::Result;
+
 pub struct MidiPlugin;
 
 impl Plugin for MidiPlugin {
     fn build(&self, app: &mut App) {
+        // TODO: Update `bevy_midi` to treat connections as entities
+        // in order to support hot-plugging
         app.insert_resource(MidiOutputSettings {
-            port_name: "output",
-        })
-        .add_plugins(MidiOutputPlugin);
+            port_name: "libprocessing output",
+        });
+
+        app.add_plugins(MidiOutputPlugin);
+    }
+}
+
+pub fn connect(In(port): In<usize>, output: Res<MidiOutput>) -> Result<()> {
+    if let Some((_, port)) = output.ports().get(port) {
+        output.connect(port.clone());
     }
+    Ok(())
 }
 
-pub fn connect(_port: usize) {
-    // we need to work with the ECS
-    // do we pass a MidiCommand to Bevy?
+pub fn disconnect(output: Res<MidiOutput>) -> Result<()> {
+    output.disconnect();
+    Ok(())
 }
 
-pub fn disconnect() {}
-pub fn refresh_ports() {}
+pub fn refresh_ports(output: Res<MidiOutput>) -> Result<()> {
+    output.refresh_ports();
+    Ok(())
+}
+
+pub fn play_notes(In((note, duration)): In<(u8, u64)>, output: Res<MidiOutput>) -> Result<()> {
+    output.send([0b1001_0000, note, 127].into()); // Note on, channel 1, max velocity
+
+    std::thread::sleep(std::time::Duration::from_millis(duration));
 
-pub fn play_notes() {}
+    output.send([0b1000_0000, note, 127].into()); // Note on, channel 1, max velocity
+
+    Ok(())
+}

crates/processing_midi/src/lib.rs

@@ -21,6 +21,7 @@ raw-window-handle = "0.6"
 half = "2.7"
 crossbeam-channel = "0.5"
 processing_core = { workspace = true }
+processing_midi = { workspace = true }
 
 [build-dependencies]
 wesl = { workspace = true, features = ["package"] }

crates/processing_render/Cargo.toml

@@ -4,7 +4,6 @@ mod graphics;
 pub mod image;
 pub mod light;
 pub mod material;
-pub mod midi;
 pub mod render;
 pub mod sketch;
 pub(crate) mod surface;
@@ -1268,23 +1267,29 @@ pub fn gltf_light(gltf_entity: Entity, index: usize) -> error::Result<Entity> {
 pub fn midi_refresh_ports() -> error::Result<()> {
     app_mut(|app| {
         let world = app.world_mut();
-        world.run_system_cached(midi::refresh_ports).unwrap()
+        world
+            .run_system_cached(processing_midi::refresh_ports)
+            .unwrap()
     })
 }
 
 #[cfg(not(target_arch = "wasm32"))]
 pub fn midi_connect(port: usize) -> error::Result<()> {
     app_mut(|app| {
         let world = app.world_mut();
-        world.run_system_cached_with(midi::connect, port).unwrap()
+        world
+            .run_system_cached_with(processing_midi::connect, port)
+            .unwrap()
     })
 }
 
 #[cfg(not(target_arch = "wasm32"))]
 pub fn midi_disconnect() -> error::Result<()> {
     app_mut(|app| {
         let world = app.world_mut();
-        world.run_system_cached(midi::disconnect).unwrap()
+        world
+            .run_system_cached(processing_midi::disconnect)
+            .unwrap()
     })
 }
 
@@ -1293,7 +1298,7 @@ pub fn midi_play_notes(note: u8, duration: u64) -> error::Result<()> {
     app_mut(|app| {
         let world = app.world_mut();
         world
-            .run_system_cached_with(midi::play_notes, (note, duration))
+            .run_system_cached_with(processing_midi::play_notes, (note, duration))
             .unwrap()
     })
 }