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

Almost works

Browse source
This commit is contained in:
Gwilym Kuiper 2022-10-02 21:18:29 +01:00
parent 2ffc68c5c1
commit c6d961cd8d
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -341,6 +341,7 @@ impl SoundBuffer {
struct MixerBuffer { struct MixerBuffer {
buffers: [SoundBuffer; 3], buffers: [SoundBuffer; 3],
working_buffer: Box<[Num<i16, 4>], InternalAllocator>,
frequency: Frequency, frequency: Frequency,
state: Mutex<RefCell<MixerBufferState>>, state: Mutex<RefCell<MixerBufferState>>,
@ -380,6 +381,10 @@ impl MixerBufferState {
impl MixerBuffer { impl MixerBuffer {
fn new(frequency: Frequency) -> Self { fn new(frequency: Frequency) -> Self {
let mut working_buffer =
Vec::with_capacity_in(frequency.buffer_size() * 2, InternalAllocator);
working_buffer.resize(frequency.buffer_size() * 2, 0.into());
MixerBuffer { MixerBuffer {
buffers: [ buffers: [
SoundBuffer::new(frequency), SoundBuffer::new(frequency),
@ -387,6 +392,8 @@ impl MixerBuffer {
SoundBuffer::new(frequency), SoundBuffer::new(frequency),
], ],
working_buffer: working_buffer.into_boxed_slice(),
state: Mutex::new(RefCell::new(MixerBufferState { state: Mutex::new(RefCell::new(MixerBufferState {
active_buffer: 0, active_buffer: 0,
playing_buffer: 0, playing_buffer: 0,
@ -414,8 +421,7 @@ impl MixerBuffer {
fn write_channels<'a>(&mut self, channels: impl Iterator<Item = &'a mut SoundChannel>) { fn write_channels<'a>(&mut self, channels: impl Iterator<Item = &'a mut SoundChannel>) {
set_asm_buffer_size(self.frequency); set_asm_buffer_size(self.frequency);
let mut buffer = Vec::with_capacity_in(self.frequency.buffer_size() * 2, InternalAllocator); self.working_buffer.fill(0.into());
buffer.resize(self.frequency.buffer_size() * 2, 0.into());
for channel in channels { for channel in channels {
if channel.is_done { if channel.is_done {
@ -444,7 +450,7 @@ impl MixerBuffer {
unsafe { unsafe {
agb_rs__mixer_add_stereo( agb_rs__mixer_add_stereo(
channel.data.as_ptr().add(channel.pos.floor()), channel.data.as_ptr().add(channel.pos.floor()),
buffer.as_mut_ptr(), self.working_buffer.as_mut_ptr(),
channel.volume, channel.volume,
); );
} }
@ -455,7 +461,7 @@ impl MixerBuffer {
unsafe { unsafe {
agb_rs__mixer_add( agb_rs__mixer_add(
channel.data.as_ptr().add(channel.pos.floor()), channel.data.as_ptr().add(channel.pos.floor()),
buffer.as_mut_ptr(), self.working_buffer.as_mut_ptr(),
playback_speed, playback_speed,
left_amount, left_amount,
right_amount, right_amount,
@ -471,7 +477,7 @@ impl MixerBuffer {
let write_buffer = &mut self.buffers[write_buffer_index].0; let write_buffer = &mut self.buffers[write_buffer_index].0;
unsafe { unsafe {
agb_rs__mixer_collapse(write_buffer.as_mut_ptr(), buffer.as_ptr()); agb_rs__mixer_collapse(write_buffer.as_mut_ptr(), self.working_buffer.as_ptr());
} }
} }
} }