Further refactoring of DeviceHandles.

Also fixes rustaudio/cpal#515.
This commit is contained in:
Alex Moon 2020-12-09 08:33:18 -07:00
parent b89df31797
commit 9c4e240a7c
2 changed files with 42 additions and 50 deletions

View file

@ -1,6 +1,6 @@
use super::alsa;
use super::parking_lot::Mutex;
use super::Device;
use super::{Device, DeviceHandles};
use {BackendSpecificError, DevicesError};
/// ALSA implementation for `Devices`.
@ -27,37 +27,17 @@ impl Iterator for Devices {
match self.hint_iter.next() {
None => return None,
Some(hint) => {
let name = hint.name;
let io = hint.direction;
if let Some(io) = io {
if io != alsa::Direction::Playback {
continue;
}
}
let name = match name {
Some(name) => {
// Ignoring the `null` device.
if name == "null" {
continue;
}
name
}
_ => continue,
let name = match hint.name {
None => continue,
// Ignoring the `null` device.
Some(name) if name == "null" => continue,
Some(name) => name,
};
// See if the device has an available output stream.
let playback = alsa::pcm::PCM::new(&name, alsa::Direction::Playback, true).ok();
// See if the device has an available input stream.
let capture = alsa::pcm::PCM::new(&name, alsa::Direction::Capture, true).ok();
if playback.is_some() || capture.is_some() {
if let Ok(handles) = DeviceHandles::open(&name) {
return Some(Device {
name,
handles: Mutex::new(super::DeviceHandles { playback, capture }),
handles: Mutex::new(handles),
});
}
}
@ -70,10 +50,7 @@ impl Iterator for Devices {
pub fn default_input_device() -> Option<Device> {
Some(Device {
name: "default".to_owned(),
handles: Mutex::new(super::DeviceHandles {
playback: None,
capture: None,
}),
handles: Mutex::new(Default::default()),
})
}
@ -81,10 +58,7 @@ pub fn default_input_device() -> Option<Device> {
pub fn default_output_device() -> Option<Device> {
Some(Device {
name: "default".to_owned(),
handles: Mutex::new(super::DeviceHandles {
playback: None,
capture: None,
}),
handles: Mutex::new(Default::default()),
})
}