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

Fixing compile errors

This commit is contained in:
Viktor Lazarev 2019-08-29 08:34:41 +02:00 committed by mitchmindtree
parent a412b00336
commit a218dc90e6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/host/wasapi/device.rs
View File

@ -96,6 +96,7 @@ pub struct Device {
impl DeviceTrait for Device { impl DeviceTrait for Device {
type SupportedInputFormats = SupportedInputFormats; type SupportedInputFormats = SupportedInputFormats;
type SupportedOutputFormats = SupportedOutputFormats; type SupportedOutputFormats = SupportedOutputFormats;
type Stream = Stream;
fn name(&self) -> Result<String, DeviceNameError> { fn name(&self) -> Result<String, DeviceNameError> {
Device::name(self) Device::name(self)

10
src/host/wasapi/stream.rs
View File

@ -239,7 +239,7 @@ fn run_inner(run_context: RunContext, data_callback: &mut dyn FnMut(StreamData),
unsafe { unsafe {
'stream_loop: loop { 'stream_loop: loop {
// Process queued commands. // Process queued commands.
match process_commands(run_context, error_callback) { match process_commands(&mut run_context) {
Ok(()) => (), Ok(()) => (),
Err(err) => { Err(err) => {
error_callback(err); error_callback(err);
@ -251,7 +251,7 @@ fn run_inner(run_context: RunContext, data_callback: &mut dyn FnMut(StreamData),
let handle_idx = match wait_for_handle_signal(&run_context.handles) { let handle_idx = match wait_for_handle_signal(&run_context.handles) {
Ok(idx) => idx, Ok(idx) => idx,
Err(err) => { Err(err) => {
error_callback(err); error_callback(err.into());
break 'stream_loop; break 'stream_loop;
} }
}; };
@ -312,7 +312,7 @@ fn run_inner(run_context: RunContext, data_callback: &mut dyn FnMut(StreamData),
buffer: slice, buffer: slice,
}); });
let data = StreamData::Input { buffer: unknown_buffer }; let data = StreamData::Input { buffer: unknown_buffer };
data_callback(stream.id.clone(), Ok(data)); data_callback(data);
// Release the buffer. // Release the buffer.
let hresult = (*capture_client).ReleaseBuffer(frames_available); let hresult = (*capture_client).ReleaseBuffer(frames_available);
if let Err(err) = stream_error_from_hresult(hresult) { if let Err(err) = stream_error_from_hresult(hresult) {
@ -332,7 +332,7 @@ fn run_inner(run_context: RunContext, data_callback: &mut dyn FnMut(StreamData),
AudioClientFlow::Render { render_client } => { AudioClientFlow::Render { render_client } => {
// The number of frames available for writing. // The number of frames available for writing.
let frames_available = match get_available_frames(stream) { let frames_available = match get_available_frames(&stream) {
Ok(0) => continue, // TODO: Can this happen? Ok(0) => continue, // TODO: Can this happen?
Ok(n) => n, Ok(n) => n,
Err(err) => { Err(err) => {
@ -365,7 +365,7 @@ fn run_inner(run_context: RunContext, data_callback: &mut dyn FnMut(StreamData),
buffer: slice buffer: slice
}); });
let data = StreamData::Output { buffer: unknown_buffer }; let data = StreamData::Output { buffer: unknown_buffer };
data_callback(stream.id.clone(), Ok(data)); data_callback(data);
let hresult = (*render_client) let hresult = (*render_client)
.ReleaseBuffer(frames_available as u32, 0); .ReleaseBuffer(frames_available as u32, 0);
if let Err(err) = stream_error_from_hresult(hresult) { if let Err(err) = stream_error_from_hresult(hresult) {