Merge pull request #31 from BlackPhlox/main

BlackPhlox · Nov 11, 2023 · 0f4ba7e · 0f4ba7e
2 parents 12dc350 + 54d34de
commit 0f4ba7e
Show file tree

Hide file tree

Showing 2 changed files with 187 additions and 129 deletions.
diff --git a/src/input.rs b/src/input.rs
@@ -6,6 +6,7 @@ use midir::ConnectErrorKind; // XXX: do we expose this?
 pub use midir::{Ignore, MidiInputPort};
 use std::error::Error;
 use std::fmt::Display;
+use std::future::Future;
 use MidiInputError::{ConnectionError, PortRefreshError};
 
 pub struct MidiInputPlugin;
@@ -171,7 +172,13 @@ fn setup(mut commands: Commands, settings: Res<MidiInputSettings>) {
 
  let thread_pool = IoTaskPool::get();
  thread_pool
- .spawn(midi_input(m_receiver, r_sender, settings.clone()))
+ .spawn(MidiInputTask {
+ receiver: m_receiver,
+ sender: r_sender,
+ settings: settings.clone(),
+ input: None,
+ connection: None,
+ })
  .detach();
 
  commands.insert_resource(MidiInput {
@@ -195,74 +202,44 @@ enum Reply {
  Midi(MidiData),
 }
 
-async fn midi_input(
+struct MidiInputTask {
  receiver: Receiver<Message>,
  sender: Sender<Reply>,
  settings: MidiInputSettings,
-) -> Result<(), crossbeam_channel::SendError<Reply>> {
- use Message::{ConnectToPort, DisconnectFromPort, RefreshPorts};
-
- let input = midir::MidiInput::new(settings.client_name).unwrap();
- sender.send(get_available_ports(&input))?;
 
  // Invariant: exactly one of `input` or `connection` is Some
- let mut input: Option<midir::MidiInput> = Some(input);
- let mut connection: Option<(midir::MidiInputConnection<()>, MidiInputPort)> = None;
+ input: Option<midir::MidiInput>,
+ connection: Option<(midir::MidiInputConnection<()>, MidiInputPort)>,
+}
 
- while let Ok(msg) = receiver.recv() {
- match msg {
- ConnectToPort(port) => {
- let was_connected = input.is_none();
- let s = sender.clone();
- let i = input.unwrap_or_else(|| connection.unwrap().0.close().0);
- let conn = i.connect(
- &port,
- settings.port_name,
- move |stamp, message, _| {
- let _ = s.send(Reply::Midi(MidiData {
- stamp,
- message: [message[0], message[1], message[2]].into(),
- }));
- },
- (),
- );
- match conn {
- Ok(conn) => {
- sender.send(Reply::Connected)?;
- connection = Some((conn, port));
- input = None;
- }
- Err(conn_err) => {
- sender.send(Reply::Error(ConnectionError(conn_err.kind())))?;
- if was_connected {
- sender.send(Reply::Disconnected)?;
- }
- connection = None;
- input = Some(conn_err.into_inner());
- }
- }
- }
- DisconnectFromPort => {
- if let Some((conn, _)) = connection {
- input = Some(conn.close().0);
- connection = None;
- sender.send(Reply::Disconnected)?;
- }
- }
- RefreshPorts => match &input {
- Some(i) => {
- sender.send(get_available_ports(i))?;
- }
- None => {
- let (conn, port) = connection.unwrap();
- let i = conn.close().0;
+impl Future for MidiInputTask {
+ type Output = ();
 
- sender.send(get_available_ports(&i))?;
+ fn poll(
+ mut self: std::pin::Pin<&mut Self>,
+ cx: &mut std::task::Context<'_>,
+ ) -> std::task::Poll<Self::Output> {
+ if self.input.is_none() && self.connection.is_none() {
+ self.input = midir::MidiInput::new(self.settings.client_name).ok();
+ self.sender
+ .send(get_available_ports(self.input.as_ref().unwrap()))
+ .unwrap();
+ }
+
+ if let Ok(msg) = self.receiver.recv() {
+ use Message::{ConnectToPort, DisconnectFromPort, RefreshPorts};
 
- let s = sender.clone();
+ match msg {
+ ConnectToPort(port) => {
+ let was_connected = self.input.is_none();
+ let s = self.sender.clone();
+ let i = self
+ .input
+ .take()
+ .unwrap_or_else(|| self.connection.take().unwrap().0.close().0);
  let conn = i.connect(
  &port,
- settings.port_name,
+ self.settings.port_name,
  move |stamp, message, _| {
  let _ = s.send(Reply::Midi(MidiData {
  stamp,
@@ -273,21 +250,72 @@ async fn midi_input(
  );
  match conn {
  Ok(conn) => {
- connection = Some((conn, port));
- input = None;
+ self.sender.send(Reply::Connected).unwrap();
+ self.connection = Some((conn, port));
+ self.input = None;
  }
  Err(conn_err) => {
- sender.send(Reply::Error(ConnectionError(conn_err.kind())))?;
- sender.send(Reply::Disconnected)?;
- connection = None;
- input = Some(conn_err.into_inner());
+ self.sender
+ .send(Reply::Error(ConnectionError(conn_err.kind())))
+ .unwrap();
+ if was_connected {
+ self.sender.send(Reply::Disconnected).unwrap();
+ }
+ self.connection = None;
+ self.input = Some(conn_err.into_inner());
  }
  }
  }
- },
+ DisconnectFromPort => {
+ if let Some((conn, _)) = self.connection.take() {
+ self.input = Some(conn.close().0);
+ self.connection = None;
+ self.sender.send(Reply::Disconnected).unwrap();
+ }
+ }
+ RefreshPorts => match &self.input {
+ Some(i) => {
+ self.sender.send(get_available_ports(i)).unwrap();
+ }
+ None => {
+ let (conn, port) = self.connection.take().unwrap();
+ let i = conn.close().0;
+
+ self.sender.send(get_available_ports(&i)).unwrap();
+
+ let s = self.sender.clone();
+ let conn = i.connect(
+ &port,
+ self.settings.port_name,
+ move |stamp, message, _| {
+ let _ = s.send(Reply::Midi(MidiData {
+ stamp,
+ message: [message[0], message[1], message[2]].into(),
+ }));
+ },
+ (),
+ );
+ match conn {
+ Ok(conn) => {
+ self.connection = Some((conn, port));
+ self.input = None;
+ }
+ Err(conn_err) => {
+ self.sender
+ .send(Reply::Error(ConnectionError(conn_err.kind())))
+ .unwrap();
+ self.sender.send(Reply::Disconnected).unwrap();
+ self.connection = None;
+ self.input = Some(conn_err.into_inner());
+ }
+ }
+ }
+ },
+ }
  }
+ cx.waker().wake_by_ref();
+ std::task::Poll::Pending
  }
- Ok(())
 }
 
 // Helper for above.