Consolidate MidiEvent type

Author: gridbugs

midi-file/src/lib.rs

@@ -1,17 +1,10 @@
 use caw_core::*;
-pub use caw_midi::{MidiMessages, MidiMessagesT};
+pub use caw_midi::{MidiEvent, MidiMessages, MidiMessagesT};
 use midly::{
-    num::u4, Format, MetaMessage, MidiMessage, Smf, Timing, TrackEvent,
-    TrackEventKind,
+    Format, MetaMessage, Smf, Timing, TrackEvent, TrackEventKind, num::u4,
 };
 use std::{fs, path::Path};
 
-#[derive(Debug, Clone, Copy)]
-pub struct MidiEvent {
-    pub channel: u4,
-    pub message: MidiMessage,
-}
-
 pub struct MidiFile {
     smf: Smf<'static>,
 }

midi-live/src/lib.rs

@@ -1,15 +1,9 @@
 use caw_core::{Sig, SigT};
-use caw_midi::MidiMessages;
+use caw_midi::{MidiEvent, MidiMessages};
 use midir::{MidiInput, MidiInputConnection, MidiInputPort};
 use midly::live::LiveEvent;
-use midly::{num::u4, MidiMessage};
 use std::{cell::RefCell, mem, rc::Rc, sync::mpsc};
 
-struct MidiEvent {
-    pub channel: u4,
-    pub message: MidiMessage,
-}
-
 pub struct MidiLive {
     midi_input: MidiInput,
     midi_input_ports: Vec<MidiInputPort>,
@@ -122,7 +116,10 @@ impl MidiLiveConnection {
             let mut message_buffers = self.message_buffers.borrow_mut();
             let buffer = &mut message_buffers.buffers[channel as usize];
             if buffer.subscribed {
-                panic!("Midi channel {} subscribed to multiple times. Each midi channel may be subscribed to only once.", channel);
+                panic!(
+                    "Midi channel {} subscribed to multiple times. Each midi channel may be subscribed to only once.",
+                    channel
+                );
             }
             buffer.subscribed = true;
         }

midi-udp-client/Cargo.toml

@@ -12,6 +12,7 @@ documentation = "https://docs.rs/caw_widgets"
 [dependencies]
 anyhow = "1.0"
 midly = "0.5"
+caw_midi = { version = "0.4", path = "../midi" }
 
 [dev-dependencies]
 env_logger = "0.11"

midi-udp-client/src/lib.rs

@@ -1,3 +1,4 @@
+use caw_midi::MidiEvent;
 use midly::live::LiveEvent;
 pub use midly::{MidiMessage, num::u4};
 use std::net::{Ipv4Addr, ToSocketAddrs, UdpSocket};
@@ -6,11 +7,6 @@ pub struct MidiUdpClient {
     socket: UdpSocket,
 }
 
-pub struct MidiEvent {
-    pub channel: u4,
-    pub message: MidiMessage,
-}
-
 impl MidiUdpClient {
     pub fn new<A: ToSocketAddrs>(addrs: A) -> anyhow::Result<Self> {
         let socket = UdpSocket::bind((Ipv4Addr::UNSPECIFIED, 0))?;

midi-udp-widgets-app/Cargo.toml

@@ -10,6 +10,7 @@ repository = "https://github.com/gridbugs/caw.git"
 
 [dependencies]
 caw_widgets = { version = "0.4", path = "../widgets" }
+caw_midi = { version = "0.4", path = "../midi" }
 caw_midi_udp_client = { version = "0.1", path = "../midi-udp-client" }
 caw_keyboard = { version = "0.4", path = "../keyboard" }
 clap = { version = "4", features = ["derive"] }

midi-udp-widgets-app/src/main.rs

@@ -3,6 +3,7 @@
 //! run a UDP server which receives MIDI over UDP.
 
 use caw_keyboard::{Note, note};
+use caw_midi::MidiEvent;
 use caw_midi_udp_client::*;
 use caw_widgets::{Button, ComputerKeyboard, Knob, Xy};
 use clap::{Parser, Subcommand};

midi/src/lib.rs

@@ -297,6 +297,7 @@ where
         self.buf.resize_with(ctx.num_samples, Default::default);
         let midi_events = self.midi_events.sample(ctx);
         {
+            // Only copy messages from the first sample worth of events.
             let midi_messages = &mut self.buf[0];
             if let Some(midi_events) = midi_events.iter().next() {
                 for midi_event in midi_events {