Add timestamps

Author: geom3trik

src/backends/asio/device.rs

@@ -198,6 +198,11 @@ impl AudioInputDevice for AsioDevice {
         let (tx, rx) = oneshot::channel::<oneshot::Sender<Callback>>();
         let mut callback = Some(callback);
 
+        let mut timestamp = Timestamp {
+            samplerate: stream_config.samplerate,
+            counter: 0,
+        };
+
         let callback_id = self.driver.add_callback(move |callback_info| unsafe {
             if let Ok(sender) = rx.try_recv() {
                 sender.send(callback.take().unwrap()).unwrap();
@@ -206,10 +211,7 @@ impl AudioInputDevice for AsioDevice {
 
             let buffer_index = callback_info.buffer_index as usize;
 
-            let timestamp = Timestamp {
-                samplerate: 41000.0,
-                counter: 0,
-            };
+            timestamp += input_stream.buffer_size as u64;
 
             let context = AudioCallbackContext {
                 stream_config,
@@ -282,6 +284,11 @@ impl AudioOutputDevice for AsioDevice {
         let (tx, rx) = oneshot::channel::<oneshot::Sender<Callback>>();
         let mut callback = Some(callback);
 
+        let mut timestamp = Timestamp {
+            samplerate: stream_config.samplerate,
+            counter: 0,
+        };
+
         let callback_id = self.driver.add_callback(move |callback_info| unsafe {
             if let Ok(sender) = rx.try_recv() {
                 sender.send(callback.take().unwrap()).unwrap();
@@ -290,10 +297,7 @@ impl AudioOutputDevice for AsioDevice {
 
             let buffer_index = callback_info.buffer_index as usize;
 
-            let timestamp = Timestamp {
-                samplerate: 41000.0,
-                counter: 0,
-            };
+            timestamp += output_stream.buffer_size as u64;
 
             let context = AudioCallbackContext {
                 stream_config,
@@ -366,6 +370,11 @@ impl AudioDuplexDevice for AsioDevice {
         let (tx, rx) = oneshot::channel::<oneshot::Sender<Callback>>();
         let mut callback = Some(callback);
 
+        let mut timestamp = Timestamp {
+            samplerate: stream_config.samplerate,
+            counter: 0,
+        };
+
         let callback_id = self.driver.add_callback(move |callback_info| unsafe {
             if let Ok(sender) = rx.try_recv() {
                 sender.send(callback.take().unwrap()).unwrap();
@@ -374,10 +383,7 @@ impl AudioDuplexDevice for AsioDevice {
 
             let buffer_index = callback_info.buffer_index as usize;
 
-            let timestamp = Timestamp {
-                samplerate: 41000.0,
-                counter: 0,
-            };
+            timestamp += output_stream.buffer_size as u64;
 
             let input = create_input(
                 &input_data_type,
@@ -695,16 +701,4 @@ fn f32_to_i32(f: f32) -> i32 {
 /// Helper function to convert from f32 to i24.
 fn f32_to_i24(f: f32) -> i32 {
     (f * 0x7FFFFF as f32) as i32
-}
-
-// fn asio_ns_to_double(val: sys::bindings::asio_import::ASIOTimeStamp) -> f64 {
-//     let two_raised_to_32 = 4294967296.0;
-//     val.lo as f64 + val.hi as f64 * two_raised_to_32
-// }
-
-// fn system_time_to_timestamp(system_time: asio::AsioTime) -> timestamp::Timestamp {
-//     let systime_ns = asio_ns_to_double(system_time);
-//     let secs = systime_ns as i64 / 1_000_000_000;
-//     let nanos = (systime_ns as i64 - secs * 1_000_000_000) as u32;
-
-// }
+}

src/backends/asio/mod.rs

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

src/backends/asio/prelude.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::driver::AsioDriver::new().unwrap());
+    return default_output_device_from(&asio::AsioDriver::new().unwrap());
 }

src/backends/mod.rs

@@ -1,8 +1,6 @@
 #![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::*;