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

remove u16

This commit is contained in:
Tom Gowan 2018-11-06 12:33:07 +11:00 committed by mitchmindtree
parent 616974353b
commit 523d25ad49
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,11 +58,13 @@ struct I16Buffer {
// TODO This never gets used as there is // TODO This never gets used as there is
// no usigned variants of ASIO buffers // no usigned variants of ASIO buffers
// and can probably be removed. // and can probably be removed.
/*
#[derive(Default)] #[derive(Default)]
struct U16Buffer { struct U16Buffer {
cpal: Vec<u16>, cpal: Vec<u16>,
channel: Vec<Vec<u16>>, channel: Vec<Vec<u16>>,
} }
*/
#[derive(Default)] #[derive(Default)]
struct F32Buffer { struct F32Buffer {
cpal: Vec<f32>, cpal: Vec<f32>,
@ -70,7 +72,7 @@ struct F32Buffer {
} }
struct Buffers { struct Buffers {
i16_buff: I16Buffer, i16_buff: I16Buffer,
u16_buff: U16Buffer, //u16_buff: U16Buffer,
f32_buff: F32Buffer, f32_buff: F32Buffer,
} }
@ -222,22 +224,10 @@ impl EventLoop {
.map(|_| Vec::with_capacity(channel_len)) .map(|_| Vec::with_capacity(channel_len))
.collect(), .collect(),
}, },
u16_buff: U16Buffer::default(),
f32_buff: F32Buffer::default(),
},
SampleFormat::U16 => Buffers {
i16_buff: I16Buffer::default(),
u16_buff: U16Buffer {
cpal: vec![0 as u16; cpal_num_samples],
channel: (0 .. num_channels)
.map(|_| Vec::with_capacity(channel_len))
.collect(),
},
f32_buff: F32Buffer::default(), f32_buff: F32Buffer::default(),
}, },
SampleFormat::F32 => Buffers { SampleFormat::F32 => Buffers {
i16_buff: I16Buffer::default(), i16_buff: I16Buffer::default(),
u16_buff: U16Buffer::default(),
f32_buff: F32Buffer { f32_buff: F32Buffer {
cpal: vec![0 as f32; cpal_num_samples], cpal: vec![0 as f32; cpal_num_samples],
channel: (0 .. num_channels) channel: (0 .. num_channels)
@ -245,6 +235,7 @@ impl EventLoop {
.collect(), .collect(),
}, },
}, },
_ => unimplemented!(),
}; };
// Set the input callback. // Set the input callback.
@ -521,22 +512,10 @@ impl EventLoop {
.map(|_| Vec::with_capacity(channel_len)) .map(|_| Vec::with_capacity(channel_len))
.collect(), .collect(),
}, },
u16_buff: U16Buffer::default(),
f32_buff: F32Buffer::default(),
},
SampleFormat::U16 => Buffers {
i16_buff: I16Buffer::default(),
u16_buff: U16Buffer {
cpal: vec![0 as u16; cpal_num_samples],
channel: (0 .. num_channels)
.map(|_| Vec::with_capacity(channel_len))
.collect(),
},
f32_buff: F32Buffer::default(), f32_buff: F32Buffer::default(),
}, },
SampleFormat::F32 => Buffers { SampleFormat::F32 => Buffers {
i16_buff: I16Buffer::default(), i16_buff: I16Buffer::default(),
u16_buff: U16Buffer::default(),
f32_buff: F32Buffer { f32_buff: F32Buffer {
cpal: vec![0 as f32; cpal_num_samples], cpal: vec![0 as f32; cpal_num_samples],
channel: (0 .. num_channels) channel: (0 .. num_channels)
@ -544,6 +523,7 @@ impl EventLoop {
.collect(), .collect(),
}, },
}, },
_ => unimplemented!(),
}; };
sys::set_callback(move |index| unsafe { sys::set_callback(move |index| unsafe {