Merge pull request #13 from pavhofman/master

API: Derived Debug, PartialEq for public enums.

Author: HEnquist

src/api.rs

@@ -68,21 +68,30 @@ pub fn initialize_sta() -> Result<(), windows::core::Error> {
 }
 
 /// Audio direction, playback or capture.
-#[derive(Clone)]
+#[derive(Clone, Debug, PartialEq)]
 pub enum Direction {
     Render,
     Capture,
 }
 
+impl fmt::Display for Direction {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match *self {
+            Direction::Render => write!(f, "Render"),
+            Direction::Capture => write!(f, "Capture"),
+        }
+    }
+}
+
 /// Sharemode for device
-#[derive(Clone)]
+#[derive(Clone, Debug, PartialEq)]
 pub enum ShareMode {
     Shared,
     Exclusive,
 }
 
 /// Sample type, float or integer
-#[derive(Clone)]
+#[derive(Clone, Debug, PartialEq)]
 pub enum SampleType {
     Float,
     Int,
@@ -162,7 +171,7 @@ impl DeviceCollection {
 /// Struct wrapping an [IMMDevice](https://docs.microsoft.com/en-us/windows/win32/api/mmdeviceapi/nn-mmdeviceapi-immdevice).
 pub struct Device {
     device: IMMDevice,
-    direction: Direction,
+    pub direction: Direction,
 }
 
 impl Device {
@@ -476,7 +485,7 @@ pub struct AudioSessionControl {
 }
 
 /// States of an AudioSession
-#[derive(Debug)]
+#[derive(Debug, PartialEq)]
 pub enum SessionState {
     Active,
     Inactive,
@@ -612,6 +621,7 @@ impl AudioRenderClient {
 }
 
 /// Struct representing the [ _AUDCLNT_BUFFERFLAGS enums](https://docs.microsoft.com/en-us/windows/win32/api/audioclient/ne-audioclient-_audclnt_bufferflags).
+#[derive(Debug)]
 pub struct BufferFlags {
     /// AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY
     pub data_discontinuity: bool,

src/events.rs

@@ -239,11 +239,27 @@ impl IAudioSessionEvents_Impl for AudioSessionEvents {
         trace!("New channel volume for channel: {}", changedchannel);
         let volslice =
             unsafe { slice::from_raw_parts(newchannelvolumearray, channelcount as usize) };
-        let newvol = volslice[changedchannel as usize];
         if let Some(callbacks) = &mut self.callbacks.upgrade() {
             if let Some(callback) = &callbacks.channel_volume {
                 let context = unsafe { *eventcontext };
-                callback(changedchannel as usize, newvol, context);
+                if changedchannel == u32::MAX {
+                    // special meaning by specs: (DWORD)(-1) - "more than one channel have changed"
+                    // using all channels
+                    for  (idx, newvol) in volslice.iter().enumerate() {
+                        callback(idx, *newvol, context);
+                    }
+                }
+                if (changedchannel as usize) < volslice.len() {
+                    let newvol = volslice[changedchannel as usize];
+                    callback(changedchannel as usize, newvol, context);
+                } else {
+                    warn!(
+                        "OnChannelVolumeChanged: received unsupported changedchannel value {} for volume array length of {}",
+                        changedchannel,
+                        volslice.len()
+                    );
+                    return Ok(());
+                }
             }
         }
         Ok(())

src/waveformat.rs

@@ -62,10 +62,14 @@ impl WaveFormat {
             SampleType::Float => KSDATAFORMAT_SUBTYPE_IEEE_FLOAT,
             SampleType::Int => KSDATAFORMAT_SUBTYPE_PCM,
         };
-        let mut mask = 0;
-        for n in 0..channels {
-            mask += 1 << n;
-        }
+        // only max 18 mask channel positions are defined (https://www.ambisonic.net/mulchaud.html#_Toc446153101)
+        let mask = match channels {
+            ch if ch <= 18 => {
+                // setting bit for each channel
+                (1 << ch) - 1
+            }
+            _ => 0,
+        };
         let wave_fmt = WAVEFORMATEXTENSIBLE {
             Format: wave_format,
             Samples: sample,