alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-23 08:11:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix crackly audio

Browse source
This commit is contained in:
Gwilym Inzani 2023-07-16 20:37:48 +01:00
parent 8191de3546
commit d4b2a2bc1a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
agb/src/sound/mixer/sw_mixer.rs
View file

@ -414,7 +414,7 @@ impl MixerBuffer {
) { ) {
working_buffer.fill(0.into()); working_buffer.fill(0.into());
let mut channels = channels let channels = channels
.filter(|channel| !channel.is_done) .filter(|channel| !channel.is_done)
.filter_map(|channel| { .filter_map(|channel| {
let playback_speed = if channel.is_stereo { let playback_speed = if channel.is_stereo {
@ -448,6 +448,8 @@ impl MixerBuffer {
self.frequency.buffer_size(), self.frequency.buffer_size(),
); );
} }
channel.pos += 2 * self.frequency.buffer_size() as u32;
} else { } else {
let right_amount = ((channel.panning + 1) / 2) * channel.volume; let right_amount = ((channel.panning + 1) / 2) * channel.volume;
let left_amount = ((-channel.panning + 1) / 2) * channel.volume; let left_amount = ((-channel.panning + 1) / 2) * channel.volume;
@ -455,7 +457,7 @@ impl MixerBuffer {
let channel_len = Num::<u32, 8>::new(channel.data.len() as u32); let channel_len = Num::<u32, 8>::new(channel.data.len() as u32);
'outer: for i in 0..self.frequency.buffer_size() { 'outer: for i in 0..self.frequency.buffer_size() {
while channel.pos >= channel_len { if channel.pos >= channel_len {
if channel.should_loop { if channel.should_loop {
channel.pos -= channel_len; channel.pos -= channel_len;
} else { } else {
@ -466,15 +468,13 @@ impl MixerBuffer {
let value = channel.data[channel.pos.floor() as usize] as i8 as i16; let value = channel.data[channel.pos.floor() as usize] as i8 as i16;
working_buffer[2 * i] += left_amount * value; working_buffer[2 * i] += right_amount * value;
working_buffer[2 * i + 1] += right_amount * value; working_buffer[2 * i + 1] += left_amount * value;
channel.pos += playback_speed; channel.pos += playback_speed;
} }
} }
} }
channel.pos += playback_speed * self.frequency.buffer_size() as u32;
} }
let write_buffer = free(|cs| self.state.borrow(cs).borrow_mut().active_advanced()); let write_buffer = free(|cs| self.state.borrow(cs).borrow_mut().active_advanced());