Modify API to use a "samples" iterator

This commit is contained in:
Pierre Krieger 2014-12-15 15:29:59 +01:00
parent 27c91645ad
commit 04d07c27dc
4 changed files with 62 additions and 29 deletions

View file

@ -20,7 +20,7 @@ fn main() {
loop {
let mut buffer = channel.append_data(1, cpal::SamplesRate(44100));
for sample in buffer.iter_mut() {
for sample in buffer.samples() {
let value = data_source.next().unwrap();
*sample = value;
}

View file

@ -9,14 +9,26 @@ fn main() {
let mut decoder = vorbis::Decoder::new(BufReader::new(include_bin!("mozart_symfony_40.ogg")))
.unwrap();
for packet in decoder.packets() {
'main: for packet in decoder.packets() {
let packet = packet.unwrap();
let vorbis::Packet { channels, rate, data, .. } = packet;
let mut buffer = channel.append_data(packet.channels, cpal::SamplesRate(packet.rate as u32));
let mut data = data.iter();
// FIXME: data loss
for (i, o) in packet.data.into_iter().zip(buffer.iter_mut()) {
*o = i as u16;
loop {
let mut buffer = channel.append_data(channels, cpal::SamplesRate(rate as u32));
let mut buffer = buffer.samples();
for output in buffer {
match data.next() {
Some(sample) => {
*output = *sample as u16;
},
None => {
continue 'main;
}
}
}
}
}
}