add default to Output

Author: yara-blue

src/lib.rs

@@ -171,7 +171,7 @@ pub use cpal::{
 mod common;
 mod sink;
 mod spatial_sink;
-#[cfg(all(feature = "playback", feature = "experimental"))]
+// #[cfg(all(feature = "playback", feature = "experimental"))]
 pub mod speakers;
 #[cfg(feature = "playback")]
 pub mod stream;

src/microphone/builder.rs

@@ -513,7 +513,7 @@ where
     /// # Ok::<(), Box<dyn std::error::Error>>(())
     /// ```
     pub fn get_config(&self) -> InputConfig {
-        self.config.copied().expect("ConfigIsSet")
+        self.config.expect("ConfigIsSet")
     }
 }
 

src/speakers.rs

@@ -108,6 +108,7 @@ use cpal::{
 
 use crate::{common::assert_error_traits, StreamError};
 
+/// TODO
 pub mod builder;
 mod config;
 
@@ -126,6 +127,7 @@ assert_error_traits! {ListError}
 #[derive(Clone)]
 pub struct Output {
     inner: cpal::Device,
+    default: bool,
 }
 
 impl From<Output> for cpal::Device {
@@ -134,6 +136,13 @@ impl From<Output> for cpal::Device {
     }
 }
 
+impl Output {
+    /// TODO
+    pub fn is_default(&self) -> bool {
+        self.default
+    }
+}
+
 impl fmt::Debug for Output {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("Device")
@@ -151,10 +160,11 @@ impl fmt::Display for Output {
 /// Returns a list of available output devices on the system.
 pub fn available_outputs() -> Result<Vec<Output>, ListError> {
     let host = cpal::default_host();
-    let devices = host
-        .output_devices()
-        .map_err(ListError)?
-        .map(|dev| Output { inner: dev });
+    let default = host.default_output_device().map(|d| d.name());
+    let devices = host.output_devices().map_err(ListError)?.map(|dev| Output {
+        default: Some(dev.name()) == default,
+        inner: dev,
+    });
     Ok(devices.collect())
 }
 

src/speakers/builder.rs

@@ -513,7 +513,7 @@ where
     /// # Ok::<(), Box<dyn std::error::Error>>(())
     /// ```
     pub fn get_config(&self) -> OutputConfig {
-        self.config.copied().expect("ConfigIsSet")
+        self.config.expect("ConfigIsSet")
     }
 }