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

Rename "StreamDataResult" to "StreamData"

This commit is contained in:
Viktor Lazarev 2019-08-28 15:20:41 +02:00 committed by mitchmindtree
parent 37e7b5b63b
commit cffd2da582
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,6 @@ use PauseStreamError;
use PlayStreamError; use PlayStreamError;
use SampleFormat; use SampleFormat;
use StreamData; use StreamData;
use StreamDataResult;
use StreamError; use StreamError;
use UnknownTypeOutputBuffer; use UnknownTypeOutputBuffer;
use UnknownTypeInputBuffer; use UnknownTypeInputBuffer;
@ -452,12 +451,12 @@ impl EventLoop {
#[inline] #[inline]
pub(crate) fn run<F>(&self, mut callback: F) -> ! pub(crate) fn run<F>(&self, mut callback: F) -> !
where F: FnMut(StreamId, StreamDataResult) where F: FnMut(StreamId, StreamData)
{ {
self.run_inner(&mut callback); self.run_inner(&mut callback);
} }
fn run_inner(&self, callback: &mut dyn FnMut(StreamId, StreamDataResult)) -> ! { fn run_inner(&self, callback: &mut dyn FnMut(StreamId, StreamData)) -> ! {
unsafe { unsafe {
// We keep `run_context` locked forever, which guarantees that two invocations of // We keep `run_context` locked forever, which guarantees that two invocations of
// `run()` cannot run simultaneously. // `run()` cannot run simultaneously.
@ -753,7 +752,7 @@ fn format_to_waveformatextensible(format: &Format) -> Option<mmreg::WAVEFORMATEX
// Process any pending commands that are queued within the `RunContext`. // Process any pending commands that are queued within the `RunContext`.
fn process_commands( fn process_commands(
run_context: &mut RunContext, run_context: &mut RunContext,
callback: &mut dyn FnMut(StreamId, StreamDataResult), callback: &mut dyn FnMut(StreamId, StreamData),
) { ) {
// Process the pending commands. // Process the pending commands.
for command in run_context.commands.try_iter() { for command in run_context.commands.try_iter() {