Skip to content

Commit

Permalink
Fix CPAL buffer bug (thanks @jesnor)
Browse files Browse the repository at this point in the history
  • Loading branch information
JerwuQu committed Apr 16, 2024
1 parent bb27497 commit ed72de7
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions src/wrapper/standalone/backend/cpal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -824,8 +824,10 @@ impl CpalMidir {
}

{
let sample_count = data.len() / num_output_channels;
assert!(sample_count <= buffer_size);
let buffers = unsafe {
buffer_manager.create_buffers(0, buffer_size, |buffer_sources| {
buffer_manager.create_buffers(0, sample_count, |buffer_sources| {
*buffer_sources.main_output_channel_pointers = Some(ChannelPointers {
ptrs: NonNull::new(main_io_channel_pointers.get().as_mut_ptr())
.unwrap(),
Expand Down Expand Up @@ -893,11 +895,10 @@ impl CpalMidir {

// The buffer's samples need to be written to `data` in an interlaced format
// SAFETY: Dropping `buffers` allows us to borrow `main_io_storage` again
for (output_sample, buffer_sample) in data
.iter_mut()
.zip(main_io_storage.iter().flat_map(|channels| channels.iter()))
{
*output_sample = T::from_sample(*buffer_sample);
for (i, output_sample) in data.iter_mut().enumerate() {
let ch = i % num_output_channels;
let n = i / num_output_channels;
*output_sample = T::from_sample(main_io_storage[ch][n]);
}

if let Some(output_event_rb_producer) = &mut output_event_rb_producer {
Expand Down

0 comments on commit ed72de7

Please sign in to comment.