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

float conversion fix

This commit is contained in:
Tom Gowan 2018-11-07 21:54:27 +11:00 committed by mitchmindtree
parent a3defde208
commit 5eb311d8be
1 changed files with 86 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/platform/windows/asio/stream.rs
View File

@ -281,19 +281,61 @@ impl EventLoop {
// Macro to convert sample from ASIO to CPAL type // Macro to convert sample from ASIO to CPAL type
macro_rules! convert_sample { macro_rules! convert_sample {
// floats types required different conversion // floats types required different conversion
(f32,
f32,
$SampleTypeIdent:ident,
$Sample:expr
) => {
*$Sample
};
(f64,
f64,
$SampleTypeIdent:ident,
$Sample:expr
) => {
*$Sample
};
(f64,
f32,
$SampleTypeIdent:ident,
$Sample:expr
) => {
*$Sample as f32
};
(f32,
f64,
$SampleTypeIdent:ident,
$Sample:expr
) => {
*$Sample as f64
};
($AsioTypeIdent:ident, ($AsioTypeIdent:ident,
f32, f32,
$SampleTypeIdent:ident, $SampleTypeIdent:ident,
$Sample:expr $Sample:expr
) => { ) => {
(*$Sample as f64 / ::std::$SampleTypeIdent::MAX as f64) as f32 (*$Sample as f64 / ::std::$AsioTypeIdent::MAX as f64) as f32
}; };
($AsioTypeIdent:ident, ($AsioTypeIdent:ident,
f64, f64,
$SampleTypeIdent:ident, $SampleTypeIdent:ident,
$Sample:expr $Sample:expr
) => { ) => {
*$Sample as f64 / ::std::$SampleTypeIdent::MAX as f64 *$Sample as f64 / ::std::$AsioTypeIdent::MAX as f64
};
(f32,
$SampleType:ty,
$SampleTypeIdent:ident,
$Sample:expr
) => {
(*$Sample as f64 * ::std::$SampleTypeIdent::MAX as f64) as $SampleType
};
(f64,
$SampleType:ty,
$SampleTypeIdent:ident,
$Sample:expr
) => {
(*$Sample as f64 * ::std::$SampleTypeIdent::MAX as f64) as $SampleType
}; };
($AsioTypeIdent:ident, ($AsioTypeIdent:ident,
$SampleType:ty, $SampleType:ty,
@ -565,6 +607,48 @@ impl EventLoop {
// Convert sample depending on the sample type // Convert sample depending on the sample type
macro_rules! convert_sample { macro_rules! convert_sample {
($AsioTypeIdent:ident,
f64,
f64,
$Sample:expr
) => {
*$Sample
};
($AsioTypeIdent:ident,
f32,
f32,
$Sample:expr
) => {
*$Sample
};
($AsioTypeIdent:ident,
f64,
f32,
$Sample:expr
) => {
*$Sample as f64
};
($AsioTypeIdent:ident,
f32,
f64,
$Sample:expr
) => {
*$Sample as f32
};
($AsioTypeIdent:ident,
$AsioType:ty,
f32,
$Sample:expr
) => {
(*$Sample as f64 * ::std::$AsioTypeIdent::MAX as f64) as $AsioType
};
($AsioTypeIdent:ident,
$AsioType:ty,
f64,
$Sample:expr
) => {
(*$Sample as f64 * ::std::$AsioTypeIdent::MAX as f64) as $AsioType
};
($AsioTypeIdent:ident, ($AsioTypeIdent:ident,
f32, f32,
$SampleTypeIdent:ident, $SampleTypeIdent:ident,