clean up

mdonoughe · May 13, 2020 · 9729ad8 · 9729ad8
1 parent 135bc05
commit 9729ad8
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 17 deletions.
diff --git a/src/ctsndcr.rs b/src/ctsndcr.rs
@@ -187,6 +187,11 @@ impl ICallback {
     /// `IEventNotify` allows a single `ICallback` instance to be registered
     /// for event notifications, but implementing `ICallback` requires a lot
     /// of COM glue that we shouldn't need to worry about.
+    ///
+    /// # Safety
+    ///
+    /// You must call IUnknown.Release on the returned object when you are done
+    /// with it.
     #[allow(clippy::new_ret_no_self)]
     pub unsafe fn new<C>(callback: C) -> *mut Self
     where

diff --git a/src/media/mod.rs b/src/media/mod.rs
@@ -134,10 +134,10 @@ impl Endpoint {
             .get_or_create(|| unsafe {
                 trace!(self.logger, "Opening PropertyStore...");
                 let mut property_store = MaybeUninit::uninit();
-                check(self.device.OpenPropertyStore(
-                    STGM_READ,
-                    property_store.as_mut_ptr(),
-                ))?;
+                check(
+                    self.device
+                        .OpenPropertyStore(STGM_READ, property_store.as_mut_ptr()),
+                )?;
                 Ok(PropertyStore(
                     ComObject::take(property_store.assume_init()),
                     self.logger.clone(),
@@ -330,7 +330,10 @@ impl DeviceEnumerator {
                 enumerator.as_mut_ptr() as *mut _,
             ))?;
             trace!(logger, "Created DeviceEnumerator");
-            Ok(DeviceEnumerator(ComObject::take(enumerator.assume_init()), logger))
+            Ok(DeviceEnumerator(
+                ComObject::take(enumerator.assume_init()),
+                logger,
+            ))
         }
     }
     /// Gets all active audio outputs.
@@ -339,18 +342,22 @@ impl DeviceEnumerator {
         unsafe {
             trace!(self.1, "Getting active endpoints...");
             let mut collection = MaybeUninit::uninit();
-            check(
-                self.0
-                    .EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, collection.as_mut_ptr()),
-            )?;
+            check(self.0.EnumAudioEndpoints(
+                eRender,
+                DEVICE_STATE_ACTIVE,
+                collection.as_mut_ptr(),
+            ))?;
             let collection = collection.assume_init();
             let mut count = 0;
             check((*collection).GetCount(&mut count))?;
             let mut result = Vec::with_capacity(count as usize);
             for i in 0..count {
                 let mut device = MaybeUninit::uninit();
                 check((*collection).Item(i, device.as_mut_ptr()))?;
-                result.push(Endpoint::new(ComObject::take(device.assume_init()), self.1.clone()))
+                result.push(Endpoint::new(
+                    ComObject::take(device.assume_init()),
+                    self.1.clone(),
+                ))
             }
             Ok(result)
         }
@@ -368,7 +375,10 @@ impl DeviceEnumerator {
                 self.0
                     .GetDefaultAudioEndpoint(eRender, eConsole, device.as_mut_ptr()),
             )?;
-            Ok(Endpoint::new(ComObject::take(device.assume_init()), self.1.clone()))
+            Ok(Endpoint::new(
+                ComObject::take(device.assume_init()),
+                self.1.clone(),
+            ))
         }
     }
     /// Get a specific audio endpoint by its ID.
@@ -378,7 +388,10 @@ impl DeviceEnumerator {
         unsafe {
             let mut device = MaybeUninit::uninit();
             check(self.0.GetDevice(buffer.as_ptr(), device.as_mut_ptr()))?;
-            Ok(Endpoint::new(ComObject::take(device.assume_init()), self.1.clone()))
+            Ok(Endpoint::new(
+                ComObject::take(device.assume_init()),
+                self.1.clone(),
+            ))
         }
     }
 }

diff --git a/src/soundcore/core.rs b/src/soundcore/core.rs
@@ -96,10 +96,10 @@ impl SoundCore {
     pub(crate) fn event_stream(&self) -> Result<SoundCoreEvents, Win32Error> {
         unsafe {
             let mut event_notify = MaybeUninit::<*mut IEventNotify>::uninit();
-            check(self.sound_core.QueryInterface(
-                &IEventNotify::uuidof(),
-                event_notify.as_mut_ptr() as *mut _,
-            ))?;
+            check(
+                self.sound_core
+                    .QueryInterface(&IEventNotify::uuidof(), event_notify.as_mut_ptr() as *mut _),
+            )?;
             Ok(SoundCoreEvents::new(
                 ComObject::take(event_notify.assume_init()),
                 self.sound_core.clone(),

diff --git a/src/soundcore/parameter.rs b/src/soundcore/parameter.rs
@@ -153,7 +153,7 @@ impl SoundCoreParameter {
                     _ => panic!("tried to set parameter with nothing"),
                 },
                 value: match *value {
-                    SoundCoreParamValue::Float(f) => mem::transmute(f),
+                    SoundCoreParamValue::Float(f) => f.to_bits(),
                     SoundCoreParamValue::Bool(b) => {
                         if b {
                             0xffff_ffff