From cffd2da582dd147fe7c6fb287bea5d7a62145db2 Mon Sep 17 00:00:00 2001 From: Viktor Lazarev Date: Wed, 28 Aug 2019 15:20:41 +0200 Subject: [PATCH] Rename "StreamDataResult" to "StreamData" --- src/host/wasapi/stream.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/host/wasapi/stream.rs b/src/host/wasapi/stream.rs index bd20ba8..617e678 100644 --- a/src/host/wasapi/stream.rs +++ b/src/host/wasapi/stream.rs @@ -28,7 +28,6 @@ use PauseStreamError; use PlayStreamError; use SampleFormat; use StreamData; -use StreamDataResult; use StreamError; use UnknownTypeOutputBuffer; use UnknownTypeInputBuffer; @@ -452,12 +451,12 @@ impl EventLoop { #[inline] pub(crate) fn run(&self, mut callback: F) -> ! - where F: FnMut(StreamId, StreamDataResult) + where F: FnMut(StreamId, StreamData) { 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 { // We keep `run_context` locked forever, which guarantees that two invocations of // `run()` cannot run simultaneously. @@ -753,7 +752,7 @@ fn format_to_waveformatextensible(format: &Format) -> Option