rob
/
cpal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compiler errors in wasapi backend after testing on windows

This commit is contained in:
mitchmindtree 2019-06-21 23:32:00 +10:00
parent 0b6e66d38e
commit 6164f83147
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wasapi/device.rs
View File

@ -409,7 +409,7 @@ impl Device {
// Retrieve the `IAudioClient`. // Retrieve the `IAudioClient`.
let lock = match self.ensure_future_audio_client() { let lock = match self.ensure_future_audio_client() {
Ok(lock) => lock, Ok(lock) => lock,
Err(e) if e.raw_os_error() == Some(AUDCLNT_E_DEVICE_INVALIDATED) => { Err(ref e) if e.raw_os_error() == Some(AUDCLNT_E_DEVICE_INVALIDATED) => {
return Err(SupportedFormatsError::DeviceNotAvailable) return Err(SupportedFormatsError::DeviceNotAvailable)
} }
Err(e) => { Err(e) => {
@ -748,11 +748,11 @@ impl Devices {
// can fail if the parameter is null, which should never happen // can fail if the parameter is null, which should never happen
check_result_backend_specific((*collection).GetCount(&mut count))?; check_result_backend_specific((*collection).GetCount(&mut count))?;
Devices { Ok(Devices {
collection: collection, collection: collection,
total_count: count, total_count: count,
next_item: 0, next_item: 0,
} })
} }
} }
} }

4
src/wasapi/mod.rs
View File

@ -21,10 +21,10 @@ fn check_result(result: HRESULT) -> Result<(), IoError> {
fn check_result_backend_specific(result: HRESULT) -> Result<(), BackendSpecificError> { fn check_result_backend_specific(result: HRESULT) -> Result<(), BackendSpecificError> {
match check_result(result) { match check_result(result) {
Ok(()) => Ok(()) Ok(()) => Ok(()),
Err(err) => { Err(err) => {
let description = format!("{}", err); let description = format!("{}", err);
return BackendSpecificError { description } return Err(BackendSpecificError { description });
} }
} }
} }