Implement duplex stream

Author: geom3trik

src/backends/asio/device.rs

@@ -2,8 +2,10 @@ use std::{borrow::Cow, sync::Arc};
 
 use asio_sys as asio;
 
-
-use crate::{device::{AudioDevice, DeviceType}, driver::AudioDriver};
+use crate::{
+    device::{AudioDevice, DeviceType},
+    driver::AudioDriver,
+};
 
 use super::{device::AsioDevice, error::AsioError};
 
@@ -14,6 +16,7 @@ pub struct AsioDriver {
 }
 
 impl AsioDriver {
+    /// Create a new ASIO driver.
     pub fn new() -> Result<Self, AsioError> {
         let asio = Arc::new(asio::Asio::new());
         Ok(AsioDriver { asio })
@@ -32,15 +35,14 @@ impl AudioDriver for AsioDriver {
 
     fn default_device(&self, device_type: DeviceType) -> Result<Option<Self::Device>, Self::Error> {
         let iter = AsioDeviceList::new(self.asio.clone())?;
-        
-        let dd  = iter.filter(|device| {
-            match (device.device_type(), device_type) {
+
+        let dd = iter
+            .filter(|device| match (device.device_type(), device_type) {
                 (DeviceType::Input | DeviceType::Duplex, DeviceType::Input) => true,
                 (DeviceType::Output | DeviceType::Duplex, DeviceType::Output) => true,
                 (a, b) => a == b,
-                
-            }
-        }).next();
+            })
+            .next();
         Ok(dd)
     }
 
@@ -79,5 +81,3 @@ impl Iterator for AsioDeviceList {
         }
     }
 }
-
-

src/backends/asio/driver.rs

@@ -1,5 +1,5 @@
-use thiserror::Error;
 use asio_sys::AsioError as AsioSysError;
+use thiserror::Error;
 
 /// Type of errors from the ASIO backend.
 #[derive(Debug, Error)]
@@ -13,4 +13,6 @@ pub enum AsioError {
     ConfigurationNotAvailable,
     #[error("Device unavailable")]
     DeviceUnavailable,
+    #[error("Multiple streams not supported")]
+    MultipleStreams,
 }

src/backends/asio/error.rs

@@ -1,7 +1,6 @@
-
-mod device;
+pub(crate) mod device;
 pub(crate) mod driver;
-mod error;
-mod stream;
+pub use driver::AsioDriver;
+pub(crate) mod error;
 pub mod prelude;
-pub use prelude::*;
+pub(crate) mod stream;

src/backends/asio/mod.rs

@@ -1,3 +1 @@
-pub use super::{
-    device::AsioDevice, driver::AsioDriver,
-};
+pub use super::{device::AsioDevice, driver::AsioDriver, error::AsioError, stream::AsioStream};

src/backends/asio/prelude.rs

@@ -1,32 +1,26 @@
-use std::{marker::PhantomData, sync::{atomic::AtomicBool, Arc}};
+use std::sync::Arc;
 
-use asio_sys::{self as asio, CallbackId};
+use asio_sys as asio;
 
 use crate::stream::AudioStreamHandle;
 
 use super::error::AsioError;
 
 pub struct AsioStream<Callback> {
-    playing: Arc<AtomicBool>,
-    // driver: Arc<asio::Driver>,
-    // streams: Arc<asio::AsioStreams>,
-    callback_id: asio::CallbackId,
-    callback: PhantomData<Callback>,
+    pub driver: Arc<asio::Driver>,
+    pub callback_id: asio::CallbackId,
+    pub callback_retrieve: oneshot::Sender<oneshot::Sender<Callback>>,
 }
 
 impl<Callback> AudioStreamHandle<Callback> for AsioStream<Callback> {
-    
     type Error = AsioError;
-    
+
     fn eject(self) -> Result<Callback, Self::Error> {
-        todo!()
+        let (tx, rx) = oneshot::channel();
+        self.callback_retrieve.send(tx).unwrap();
+        let callback = rx.recv().unwrap();
+        self.driver.stop()?;
+        self.driver.remove_callback(self.callback_id);
+        Ok(callback)
     }
 }
-
-impl<Callback> AsioStream<Callback> {
-    pub fn new(playing: Arc<AtomicBool>, callback_id: CallbackId) -> Self {
-        AsioStream { playing, callback_id, callback: PhantomData }
-    }
-
-    
-}

src/backends/asio/stream.rs

@@ -116,5 +116,5 @@ pub fn default_output_device() -> impl AudioOutputDevice {
     // #[cfg(os_wasapi)]
     // return default_output_device_from(&wasapi::WasapiDriver);
     #[cfg(os_asio)]
-    return default_output_device_from(&asio::AsioDriver::new().unwrap());
+    return default_output_device_from(&asio::driver::AsioDriver::new().unwrap());
 }

src/backends/mod.rs

@@ -1,6 +1,8 @@
 #![allow(unused)]
 //! Prelude module for `interflow`. Use as a star-import.
 
+#[cfg(os_asio)]
+pub use crate::backends::asio::prelude::*;
 #[cfg(os_wasapi)]
 pub use crate::backends::wasapi::prelude::*;
 pub use crate::backends::*;