chore: update cpal to latest Git, fix conflict

Cargo.toml

@@ -46,8 +46,6 @@ noise = ["rand", "rand_distr"]
 #
 # Enable WebAssembly support for web browsers
 wasm-bindgen = ["cpal/wasm-bindgen"]
-# Use shared C++ stdlib on Android (reduces APK size, fixes linking issues)
-cpal-shared-stdcxx = ["cpal/oboe-shared-stdcxx"]
 
 # To decode an audio source with Rodio, you need to enable the appropriate features for *both* the
 # demuxer and the decoder.
@@ -103,7 +101,7 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-cpal = { version = "0.16", optional = true }
+cpal = { git = "https://github.com/RustAudio/cpal", rev = "a8269d3c993f7d375d4655b53d3437429d4f6bd8", optional = true }
 dasp_sample = "0.11.0"
 claxon = { version = "0.4.2", optional = true }
 hound = { version = "3.5", optional = true }

examples/microphone.rs

@@ -13,7 +13,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     .prompt()?;
 
     let input = MicrophoneBuilder::new()
-        .device(input)?
+        .device(input.into_inner())?
         .default_config()?
         .open_stream()?;
 

src/microphone.rs

@@ -91,7 +91,7 @@
 //!
 //! // Use a specific device (e.g., the second one)
 //! let mic = MicrophoneBuilder::new()
-//!     .device(inputs[1].clone())?
+//!     .device(inputs[1].clone().into_inner())?
 //!     .default_config()?
 //!     .open_stream()?;
 //! # Ok(())
@@ -130,9 +130,10 @@ pub struct Input {
     inner: cpal::Device,
 }
 
-impl From<Input> for cpal::Device {
-    fn from(val: Input) -> Self {
-        val.inner
+impl Input {
+    /// Consumes the input and returns the inner device.
+    pub fn into_inner(self) -> cpal::Device {
+        self.inner
     }
 }
 
@@ -271,8 +272,7 @@ impl Microphone {
             I64, i64;
             U8, u8;
             U16, u16;
-            // TODO: uncomment when https://github.com/RustAudio/cpal/pull/1011 is merged
-            // U24, cpal::U24;
+            U24, cpal::U24;
             U32, u32;
             U64, u64
         )

src/microphone/builder.rs

@@ -128,7 +128,7 @@ where
     /// ```no_run
     /// # use rodio::microphone::{MicrophoneBuilder, available_inputs};
     /// let input = available_inputs()?.remove(2);
-    /// let builder = MicrophoneBuilder::new().device(input)?;
+    /// let builder = MicrophoneBuilder::new().device(input.into_inner())?;
     /// # Ok::<(), Box<dyn std::error::Error>>(())
     /// ```
     pub fn device(

src/stream.rs

@@ -515,8 +515,7 @@ impl OutputStream {
             I64, i64;
             U8, u8;
             U16, u16;
-            // TODO: uncomment when https://github.com/RustAudio/cpal/pull/1011 is merged
-            // U24, U24;
+            U24, cpal::U24;
             U32, u32;
             U64, u64
         );