fix(coreaudio): propagate API changes

Author: SolarLiner

src/backends/coreaudio.rs

@@ -18,15 +18,15 @@ use coreaudio::sys::{
 use thiserror::Error;
 
 use crate::audio_buffer::{AudioBuffer, Sample};
-use crate::channel_map::Bitset;
+use crate::channel_map::{Bitset, ChannelMap32};
 use crate::device::{AudioDevice, AudioInputDevice, AudioOutputDevice, Channel, DeviceType};
 use crate::driver::AudioDriver;
-use crate::prelude::ChannelMap32;
 use crate::stream::{
-    AudioCallbackContext, AudioInputCallback, AudioOutputCallback, AudioStreamHandle, StreamConfig,
+    AudioCallbackContext, AudioInput, AudioInputCallback, AudioOutput, AudioOutputCallback,
+    AudioStreamHandle, StreamConfig,
 };
 use crate::timestamp::Timestamp;
-use crate::{AudioInput, AudioOutput, SendEverywhereButOnWeb};
+use crate::SendEverywhereButOnWeb;
 
 /// Type of errors from the CoreAudio backend
 #[derive(Debug, Error)]
@@ -122,28 +122,6 @@ impl AudioDevice for CoreAudioDevice {
         self.device_type
     }
 
-    fn channel_map(&self) -> impl IntoIterator<Item = Channel> {
-        let is_input = matches!(self.device_type, DeviceType::Input);
-        let channels = match audio_unit_from_device_id(self.device_id, is_input) {
-            Err(err) => {
-                eprintln!("CoreAudio error getting audio unit: {err}");
-                0
-            }
-            Ok(audio_unit) => {
-                let stream_format = if is_input {
-                    audio_unit.input_stream_format().unwrap()
-                } else {
-                    audio_unit.output_stream_format().unwrap()
-                };
-                stream_format.channels as usize
-            }
-        };
-        (0..channels).map(|ch| Channel {
-            index: ch,
-            name: Cow::Owned(format!("Channel {}", ch)),
-        })
-    }
-
     fn is_config_supported(&self, _config: &StreamConfig) -> bool {
         true
     }
@@ -189,6 +167,23 @@ fn input_stream_format(sample_rate: f64) -> StreamFormat {
 impl AudioInputDevice for CoreAudioDevice {
     type StreamHandle<Callback: AudioInputCallback> = CoreAudioStream<Callback>;
 
+    fn input_channel_map(&self) -> impl Iterator<Item = Channel> {
+        let channels = match audio_unit_from_device_id(self.device_id, true) {
+            Err(err) => {
+                eprintln!("CoreAudio error getting audio unit: {err}");
+                0
+            }
+            Ok(audio_unit) => {
+                let stream_format = audio_unit.input_stream_format().unwrap();
+                stream_format.channels as usize
+            }
+        };
+        (0..channels).map(|ch| Channel {
+            index: ch,
+            name: Cow::Owned(format!("Channel {}", ch)),
+        })
+    }
+
     fn default_input_config(&self) -> Result<StreamConfig, Self::Error> {
         let audio_unit = audio_unit_from_device_id(self.device_id, true)?;
         let samplerate = audio_unit.get_property::<f64>(
@@ -223,6 +218,23 @@ fn output_stream_format(sample_rate: f64, channels: ChannelMap32) -> StreamForma
 }
 
 impl AudioOutputDevice for CoreAudioDevice {
+    fn output_channel_map(&self) -> impl Iterator<Item = Channel> {
+        let channels = match audio_unit_from_device_id(self.device_id, false) {
+            Err(err) => {
+                eprintln!("CoreAudio error getting audio unit: {err}");
+                0
+            }
+            Ok(audio_unit) => {
+                let stream_format = audio_unit.output_stream_format().unwrap();
+                stream_format.channels as usize
+            }
+        };
+        (0..channels).map(|ch| Channel {
+            index: ch,
+            name: Cow::Owned(format!("Channel {}", ch)),
+        })
+    }
+
     type StreamHandle<Callback: AudioOutputCallback> = CoreAudioStream<Callback>;
 
     fn default_output_config(&self) -> Result<StreamConfig, Self::Error> {

src/backends/wasapi/stream.rs

@@ -3,7 +3,8 @@ use crate::audio_buffer::{AudioMut, AudioRef};
 use crate::backends::wasapi::util::WasapiMMDevice;
 use crate::channel_map::Bitset;
 use crate::stream::{
-    AudioCallbackContext, AudioInput, AudioInputCallback, AudioOutput, AudioOutputCallback, AudioStreamHandle, StreamConfig
+    AudioCallbackContext, AudioInput, AudioInputCallback, AudioOutput, AudioOutputCallback,
+    AudioStreamHandle, StreamConfig,
 };
 use crate::timestamp::Timestamp;
 use duplicate::duplicate_item;