From cb9fa97b3158a8064caa53f6f864b79270a1a811 Mon Sep 17 00:00:00 2001 From: Ali Chraghi Date: Sun, 18 Sep 2022 21:59:19 +0430 Subject: [PATCH] sysaudio: move DataCallback into main.zig --- libs/sysaudio/src/main.zig | 2 ++ libs/sysaudio/src/soundio.zig | 3 +-- libs/sysaudio/src/webaudio.zig | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/sysaudio/src/main.zig b/libs/sysaudio/src/main.zig index c18cef73..fd65c4a5 100644 --- a/libs/sysaudio/src/main.zig +++ b/libs/sysaudio/src/main.zig @@ -14,6 +14,8 @@ pub const Error = Backend.Error; pub const Device = Backend.Device; pub const DeviceIterator = Backend.DeviceIterator; +pub const DataCallback = *const fn (device: *Device, user_data: ?*anyopaque, buffer: []u8) void; + pub const Mode = enum { input, output, diff --git a/libs/sysaudio/src/soundio.zig b/libs/sysaudio/src/soundio.zig index 9c523891..06a674ed 100644 --- a/libs/sysaudio/src/soundio.zig +++ b/libs/sysaudio/src/soundio.zig @@ -1,6 +1,7 @@ const std = @import("std"); const Mode = @import("main.zig").Mode; const Format = @import("main.zig").Format; +const DataCallback = @import("main.zig").DataCallback; const c = @import("soundio").c; const Aim = @import("soundio").Aim; const SoundIo = @import("soundio").SoundIo; @@ -16,8 +17,6 @@ const SoundIoStream = union(Mode) { const Audio = @This(); -pub const DataCallback = *const fn (device: *Device, user_data: ?*anyopaque, buffer: []u8) void; - const default_buffer_size_per_channel = 1024; // 21.33ms pub const Device = struct { diff --git a/libs/sysaudio/src/webaudio.zig b/libs/sysaudio/src/webaudio.zig index 9b7c482d..a43ebf4b 100644 --- a/libs/sysaudio/src/webaudio.zig +++ b/libs/sysaudio/src/webaudio.zig @@ -1,12 +1,11 @@ const std = @import("std"); const Mode = @import("main.zig").Mode; const Format = @import("main.zig").Format; +const DataCallback = @import("main.zig").DataCallback; const js = @import("sysjs"); const Audio = @This(); -pub const DataCallback = *const fn (device: *Device, user_data: ?*anyopaque, buffer: []u8) void; - pub const Device = struct { properties: Properties,