zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Audio: less error-prone object update

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2024-12-01 13:42:50 -07:00 • committed by Emi Gutekanst
parent 314abeb988
commit da860f84c6
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Audio.zig
View file

@ -155,8 +155,9 @@ pub fn tick(audio: *Audio, audio_mod: mach.Mod(Audio)) !void {
var buffers = audio.buffers.slice(); var buffers = audio.buffers.slice();
while (buffers.next()) |buf_id| { while (buffers.next()) |buf_id| {
var buffer = buffers.get(buf_id); var buffer = audio.buffers.getValue(buf_id);
if (!buffer.playing) continue; if (!buffer.playing) continue;
defer audio.buffers.setValue(buf_id, buffer);
const channels_diff = player_channels - buffer.channels + 1; const channels_diff = player_channels - buffer.channels + 1;
const to_read = (@min(buffer.samples.len - buffer.index, mixing_buffer.items.len) / channels_diff) + @rem(@min(buffer.samples.len - buffer.index, mixing_buffer.items.len), channels_diff); const to_read = (@min(buffer.samples.len - buffer.index, mixing_buffer.items.len) / channels_diff) + @rem(@min(buffer.samples.len - buffer.index, mixing_buffer.items.len), channels_diff);
@ -177,9 +178,6 @@ pub fn tick(audio: *Audio, audio_mod: mach.Mod(Audio)) !void {
buffer.playing = false; buffer.playing = false;
buffer.index = 0; buffer.index = 0;
} else buffer.index = buffer.index + to_read; } else buffer.index = buffer.index + to_read;
// Save changes to the buffer object
buffers.set(buf_id, buffer);
} }
} }
if (did_state_change) if (audio.on_state_change) |f| audio_mod.run(f); if (did_state_change) if (audio.on_state_change) |f| audio_mod.run(f);