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

Audio: do not use event arguments

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2024-04-29 20:33:24 -07:00
parent e711f69fad
commit 7ad38d6eff
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
examples/piano/App.zig
View file

@ -25,6 +25,7 @@ pub const Mod = mach.Mod(@This());
pub const events = .{ pub const events = .{
.init = .{ .handler = init }, .init = .{ .handler = init },
.after_init = .{ .handler = afterInit },
.deinit = .{ .handler = deinit }, .deinit = .{ .handler = deinit },
.tick = .{ .handler = tick }, .tick = .{ .handler = tick },
.audio_state_change = .{ .handler = audioStateChange }, .audio_state_change = .{ .handler = audioStateChange },
@ -37,9 +38,8 @@ pub const components = .{
ghost_key_mode: bool = false, ghost_key_mode: bool = false,
fn init(core: *mach.Core.Mod, audio: *mach.Audio.Mod, app: *Mod) void { fn init(core: *mach.Core.Mod, audio: *mach.Audio.Mod, app: *Mod) void {
// Initialize audio module, telling it to send our module's .audio_state_change event when an audio.send(.init, .{});
// entity's sound stops playing app.send(.after_init, .{});
audio.send(.init, .{app.event(.audio_state_change)});
// Initialize piano module state // Initialize piano module state
app.init(.{}); app.init(.{});
@ -53,6 +53,12 @@ fn init(core: *mach.Core.Mod, audio: *mach.Audio.Mod, app: *Mod) void {
core.send(.start, .{}); core.send(.start, .{});
} }
fn afterInit(audio: *mach.Audio.Mod, app: *Mod) void {
// Configure the audio module to send our app's .audio_state_change event when an entity's sound
// finishes playing.
audio.state().on_state_change = app.event(.audio_state_change);
}
fn deinit(core: *mach.Core.Mod, audio: *mach.Audio.Mod) void { fn deinit(core: *mach.Core.Mod, audio: *mach.Audio.Mod) void {
audio.send(.deinit, .{}); audio.send(.deinit, .{});
core.send(.deinit, .{}); core.send(.deinit, .{});

9
src/Audio.zig
View file

@ -32,7 +32,7 @@ ms_render_ahead: f32 = 16,
allocator: std.mem.Allocator, allocator: std.mem.Allocator,
ctx: sysaudio.Context, ctx: sysaudio.Context,
player: sysaudio.Player, player: sysaudio.Player,
on_state_change: mach.AnyEvent, on_state_change: ?mach.AnyEvent = null,
output_mu: std.Thread.Mutex = .{}, output_mu: std.Thread.Mutex = .{},
output: SampleBuffer, output: SampleBuffer,
mixing_buffer: ?std.ArrayListUnmanaged(f32) = null, mixing_buffer: ?std.ArrayListUnmanaged(f32) = null,
@ -43,7 +43,7 @@ var gpa = std.heap.GeneralPurposeAllocator(.{}){};
const SampleBuffer = std.fifo.LinearFifo(u8, .Dynamic); const SampleBuffer = std.fifo.LinearFifo(u8, .Dynamic);
fn init(audio: *Mod, on_state_change: mach.AnyEvent) !void { fn init(audio: *Mod) !void {
const allocator = gpa.allocator(); const allocator = gpa.allocator();
const ctx = try sysaudio.Context.init(null, allocator, .{}); const ctx = try sysaudio.Context.init(null, allocator, .{});
try ctx.refresh(); try ctx.refresh();
@ -70,7 +70,6 @@ fn init(audio: *Mod, on_state_change: mach.AnyEvent) !void {
.allocator = allocator, .allocator = allocator,
.ctx = ctx, .ctx = ctx,
.player = player, .player = player,
.on_state_change = on_state_change,
.output = SampleBuffer.init(allocator), .output = SampleBuffer.init(allocator),
.debug = debug, .debug = debug,
}); });
@ -171,7 +170,9 @@ fn audioTick(audio: *Mod) !void {
try audio.set(id, .index, index + to_read); try audio.set(id, .index, index + to_read);
} }
} }
if (did_state_change) audio.sendAnyEvent(audio.state().on_state_change); if (audio.state().on_state_change) |on_state_change_event| {
if (did_state_change) audio.sendAnyEvent(on_state_change_event);
}
// Write our rendered samples to the fifo, expanding its size as needed and converting our f32 // Write our rendered samples to the fifo, expanding its size as needed and converting our f32
// samples to the format the driver expects. // samples to the format the driver expects.