slight refactor

Author: Sin-tel

src/host/asio/stream.rs

@@ -61,37 +61,34 @@ impl Device {
             return Err(BuildStreamError::StreamConfigNotSupported);
         }
 
-        let num_channels = config.channels;
-        let buffer_size = self.get_or_create_input_stream(config, sample_format)?;
-        let cpal_num_samples = buffer_size * num_channels as usize;
-
-        // Create the buffer depending on the size of the data type.
-        let len_bytes = cpal_num_samples * sample_format.sample_size();
-        let mut interleaved = vec![0u8; len_bytes];
-
-        let stream_playing = Arc::new(AtomicBool::new(false));
-        let playing = Arc::clone(&stream_playing);
-        let asio_streams = self.asio_streams.clone();
-
-        // Wrap the error_callback in an Arc<Mutex<...>> so it can be shared with the static ASIO callback.
-        // The ASIO message callback is Fn (shared), but the user error callback is FnMut.
+        // Register the message callback with the driver
         let error_callback_shared = Arc::new(Mutex::new(error_callback));
-        let error_cb_for_asio = error_callback_shared.clone();
 
-        // Register the message callback with the driver
         let message_callback_id = self.driver.add_message_callback(move |msg| {
             // Check specifically for ResetRequest
             if let sys::AsioMessageSelectors::kAsioResetRequest = msg {
-                if let Ok(mut cb) = error_cb_for_asio.lock() {
+                if let Ok(mut cb) = error_callback_shared.lock() {
                     cb(StreamError::BackendSpecific {
                         err: BackendSpecificError {
-                            description: "ASIO Reset Request: The driver requests a reset. Please drop and recreate the stream.".to_string(),
+                            description: "ASIO reset request.".to_string(),
                         },
                     });
                 }
             }
         });
 
+        let num_channels = config.channels;
+        let buffer_size = self.get_or_create_input_stream(config, sample_format)?;
+        let cpal_num_samples = buffer_size * num_channels as usize;
+
+        // Create the buffer depending on the size of the data type.
+        let len_bytes = cpal_num_samples * sample_format.sample_size();
+        let mut interleaved = vec![0u8; len_bytes];
+
+        let stream_playing = Arc::new(AtomicBool::new(false));
+        let playing = Arc::clone(&stream_playing);
+        let asio_streams = self.asio_streams.clone();
+
         // Set the input callback.
         // This is most performance critical part of the ASIO bindings.
         let config = config.clone();
@@ -305,38 +302,35 @@ impl Device {
             return Err(BuildStreamError::StreamConfigNotSupported);
         }
 
-        let num_channels = config.channels;
-        let buffer_size = self.get_or_create_output_stream(config, sample_format)?;
-        let cpal_num_samples = buffer_size * num_channels as usize;
-
-        // Create buffers depending on data type.
-        let len_bytes = cpal_num_samples * sample_format.sample_size();
-        let mut interleaved = vec![0u8; len_bytes];
-        let current_buffer_index = self.current_buffer_index.clone();
-
-        let stream_playing = Arc::new(AtomicBool::new(false));
-        let playing = Arc::clone(&stream_playing);
-        let asio_streams = self.asio_streams.clone();
-
-        // Wrap the error_callback in an Arc<Mutex<...>> so it can be shared with the static ASIO callback.
-        // The ASIO message callback is Fn (shared), but the user error callback is FnMut.
+        // Register the message callback with the driver
         let error_callback_shared = Arc::new(Mutex::new(error_callback));
-        let error_cb_for_asio = error_callback_shared.clone();
 
-        // Register the message callback with the driver
         let message_callback_id = self.driver.add_message_callback(move |msg| {
             // Check specifically for ResetRequest
             if let sys::AsioMessageSelectors::kAsioResetRequest = msg {
-                if let Ok(mut cb) = error_cb_for_asio.lock() {
+                if let Ok(mut cb) = error_callback_shared.lock() {
                     cb(StreamError::BackendSpecific {
                         err: BackendSpecificError {
-                            description: "ASIO Reset Request: The driver requests a reset. Please drop and recreate the stream.".to_string(),
+                            description: "ASIO reset request.".to_string(),
                         },
                     });
                 }
             }
         });
 
+        let num_channels = config.channels;
+        let buffer_size = self.get_or_create_output_stream(config, sample_format)?;
+        let cpal_num_samples = buffer_size * num_channels as usize;
+
+        // Create buffers depending on data type.
+        let len_bytes = cpal_num_samples * sample_format.sample_size();
+        let mut interleaved = vec![0u8; len_bytes];
+        let current_buffer_index = self.current_buffer_index.clone();
+
+        let stream_playing = Arc::new(AtomicBool::new(false));
+        let playing = Arc::clone(&stream_playing);
+        let asio_streams = self.asio_streams.clone();
+
         let config = config.clone();
         let callback_id = self.driver.add_callback(move |callback_info| unsafe {
             // If not playing, return early.
@@ -678,7 +672,6 @@ impl Device {
 impl Drop for Stream {
     fn drop(&mut self) {
         self.driver.remove_callback(self.callback_id);
-        // Unregister the message callback to prevent memory leaks and calling dropped callbacks
         self.driver
             .remove_message_callback(self.message_callback_id);
     }