Add _raw suffix to stream constructors
This commit is contained in:
parent
5390c01641
commit
78df791377
13 changed files with 41 additions and 41 deletions
|
|
@ -80,7 +80,7 @@ impl DeviceTrait for Device {
|
|||
Device::default_output_format(self)
|
||||
}
|
||||
|
||||
fn build_input_stream<D, E>(
|
||||
fn build_input_stream_raw<D, E>(
|
||||
&self,
|
||||
format: &Format,
|
||||
data_callback: D,
|
||||
|
|
@ -95,7 +95,7 @@ impl DeviceTrait for Device {
|
|||
Ok(stream)
|
||||
}
|
||||
|
||||
fn build_output_stream<D, E>(
|
||||
fn build_output_stream_raw<D, E>(
|
||||
&self,
|
||||
format: &Format,
|
||||
data_callback: D,
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ impl DeviceTrait for Device {
|
|||
Device::default_output_format(self)
|
||||
}
|
||||
|
||||
fn build_input_stream<D, E>(
|
||||
fn build_input_stream_raw<D, E>(
|
||||
&self,
|
||||
format: &Format,
|
||||
data_callback: D,
|
||||
|
|
@ -91,10 +91,10 @@ impl DeviceTrait for Device {
|
|||
D: FnMut(&Data) + Send + 'static,
|
||||
E: FnMut(StreamError) + Send + 'static,
|
||||
{
|
||||
Device::build_input_stream(self, format, data_callback, error_callback)
|
||||
Device::build_input_stream_raw(self, format, data_callback, error_callback)
|
||||
}
|
||||
|
||||
fn build_output_stream<D, E>(
|
||||
fn build_output_stream_raw<D, E>(
|
||||
&self,
|
||||
format: &Format,
|
||||
data_callback: D,
|
||||
|
|
@ -104,7 +104,7 @@ impl DeviceTrait for Device {
|
|||
D: FnMut(&mut Data) + Send + 'static,
|
||||
E: FnMut(StreamError) + Send + 'static,
|
||||
{
|
||||
Device::build_output_stream(self, format, data_callback, error_callback)
|
||||
Device::build_output_stream_raw(self, format, data_callback, error_callback)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ impl Stream {
|
|||
}
|
||||
|
||||
impl Device {
|
||||
pub fn build_input_stream<D, E>(
|
||||
pub fn build_input_stream_raw<D, E>(
|
||||
&self,
|
||||
format: &Format,
|
||||
mut data_callback: D,
|
||||
|
|
@ -202,7 +202,7 @@ impl Device {
|
|||
}
|
||||
|
||||
unsupported_format_pair => unreachable!(
|
||||
"`build_input_stream` should have returned with unsupported \
|
||||
"`build_input_stream_raw` should have returned with unsupported \
|
||||
format {:?}",
|
||||
unsupported_format_pair
|
||||
),
|
||||
|
|
@ -223,7 +223,7 @@ impl Device {
|
|||
})
|
||||
}
|
||||
|
||||
pub fn build_output_stream<D, E>(
|
||||
pub fn build_output_stream_raw<D, E>(
|
||||
&self,
|
||||
format: &Format,
|
||||
mut data_callback: D,
|
||||
|
|
@ -410,7 +410,7 @@ impl Device {
|
|||
}
|
||||
|
||||
unsupported_format_pair => unreachable!(
|
||||
"`build_output_stream` should have returned with unsupported \
|
||||
"`build_output_stream_raw` should have returned with unsupported \
|
||||
format {:?}",
|
||||
unsupported_format_pair
|
||||
),
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ impl DeviceTrait for Device {
|
|||
Device::default_output_format(self)
|
||||
}
|
||||
|
||||
fn build_input_stream<D, E>(
|
||||
fn build_input_stream_raw<D, E>(
|
||||
&self,
|
||||
format: &Format,
|
||||
data_callback: D,
|
||||
|
|
@ -112,10 +112,10 @@ impl DeviceTrait for Device {
|
|||
D: FnMut(&Data) + Send + 'static,
|
||||
E: FnMut(StreamError) + Send + 'static,
|
||||
{
|
||||
Device::build_input_stream(self, format, data_callback, error_callback)
|
||||
Device::build_input_stream_raw(self, format, data_callback, error_callback)
|
||||
}
|
||||
|
||||
fn build_output_stream<D, E>(
|
||||
fn build_output_stream_raw<D, E>(
|
||||
&self,
|
||||
format: &Format,
|
||||
data_callback: D,
|
||||
|
|
@ -125,7 +125,7 @@ impl DeviceTrait for Device {
|
|||
D: FnMut(&mut Data) + Send + 'static,
|
||||
E: FnMut(StreamError) + Send + 'static,
|
||||
{
|
||||
Device::build_output_stream(self, format, data_callback, error_callback)
|
||||
Device::build_output_stream_raw(self, format, data_callback, error_callback)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -467,7 +467,7 @@ fn audio_unit_from_device(device: &Device, input: bool) -> Result<AudioUnit, cor
|
|||
}
|
||||
|
||||
impl Device {
|
||||
fn build_input_stream<D, E>(
|
||||
fn build_input_stream_raw<D, E>(
|
||||
&self,
|
||||
format: &Format,
|
||||
mut data_callback: D,
|
||||
|
|
@ -655,7 +655,7 @@ impl Device {
|
|||
}))
|
||||
}
|
||||
|
||||
fn build_output_stream<D, E>(
|
||||
fn build_output_stream_raw<D, E>(
|
||||
&self,
|
||||
format: &Format,
|
||||
mut data_callback: D,
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ impl DeviceTrait for Device {
|
|||
Device::default_output_format(self)
|
||||
}
|
||||
|
||||
fn build_input_stream<D, E>(
|
||||
fn build_input_stream_raw<D, E>(
|
||||
&self,
|
||||
_format: &Format,
|
||||
_data_callback: D,
|
||||
|
|
@ -161,7 +161,7 @@ impl DeviceTrait for Device {
|
|||
unimplemented!()
|
||||
}
|
||||
|
||||
fn build_output_stream<D, E>(
|
||||
fn build_output_stream_raw<D, E>(
|
||||
&self,
|
||||
format: &Format,
|
||||
data_callback: D,
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ impl DeviceTrait for Device {
|
|||
unimplemented!()
|
||||
}
|
||||
|
||||
fn build_input_stream<D, E>(
|
||||
fn build_input_stream_raw<D, E>(
|
||||
&self,
|
||||
_format: &Format,
|
||||
_data_callback: D,
|
||||
|
|
@ -75,7 +75,7 @@ impl DeviceTrait for Device {
|
|||
}
|
||||
|
||||
/// Create an output stream.
|
||||
fn build_output_stream<D, E>(
|
||||
fn build_output_stream_raw<D, E>(
|
||||
&self,
|
||||
_format: &Format,
|
||||
_data_callback: D,
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ impl DeviceTrait for Device {
|
|||
Device::default_output_format(self)
|
||||
}
|
||||
|
||||
fn build_input_stream<D, E>(
|
||||
fn build_input_stream_raw<D, E>(
|
||||
&self,
|
||||
format: &Format,
|
||||
data_callback: D,
|
||||
|
|
@ -105,7 +105,7 @@ impl DeviceTrait for Device {
|
|||
D: FnMut(&Data) + Send + 'static,
|
||||
E: FnMut(StreamError) + Send + 'static,
|
||||
{
|
||||
let stream_inner = self.build_input_stream_inner(format)?;
|
||||
let stream_inner = self.build_input_stream_raw_inner(format)?;
|
||||
Ok(Stream::new_input(
|
||||
stream_inner,
|
||||
data_callback,
|
||||
|
|
@ -113,7 +113,7 @@ impl DeviceTrait for Device {
|
|||
))
|
||||
}
|
||||
|
||||
fn build_output_stream<D, E>(
|
||||
fn build_output_stream_raw<D, E>(
|
||||
&self,
|
||||
format: &Format,
|
||||
data_callback: D,
|
||||
|
|
@ -123,7 +123,7 @@ impl DeviceTrait for Device {
|
|||
D: FnMut(&mut Data) + Send + 'static,
|
||||
E: FnMut(StreamError) + Send + 'static,
|
||||
{
|
||||
let stream_inner = self.build_output_stream_inner(format)?;
|
||||
let stream_inner = self.build_output_stream_raw_inner(format)?;
|
||||
Ok(Stream::new_output(
|
||||
stream_inner,
|
||||
data_callback,
|
||||
|
|
@ -610,7 +610,7 @@ impl Device {
|
|||
}
|
||||
}
|
||||
|
||||
pub(crate) fn build_input_stream_inner(
|
||||
pub(crate) fn build_input_stream_raw_inner(
|
||||
&self,
|
||||
format: &Format,
|
||||
) -> Result<StreamInner, BuildStreamError> {
|
||||
|
|
@ -754,7 +754,7 @@ impl Device {
|
|||
}
|
||||
}
|
||||
|
||||
pub(crate) fn build_output_stream_inner(
|
||||
pub(crate) fn build_output_stream_raw_inner(
|
||||
&self,
|
||||
format: &Format,
|
||||
) -> Result<StreamInner, BuildStreamError> {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue