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

{sysaudio,examples}: get sysaudio running on linux, separate audio configuration and descriptor (#518)

Browse source 
* Get sysaudio working on linux
* Separate audio configuration and descriptor
* Config/Descriptor -> Options/Properties
- Rename sysaudio DeviceConfig and DeviceDescriptor to Device.Options and Device.Properties
- example: Convert buffer before passing to renderWithType
* make Device.start() idempotent
This commit is contained in:
Louis Pearson 2022-09-09 09:58:03 -06:00 • committed by GitHub
parent f807c85232
commit 0e71daf504
Failed to generate hash of commit
4 changed files with 193 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

67
libs/sysaudio/src/main.zig
View file

@ -27,8 +27,8 @@ pub const Format = enum {
F32,
};
pub const DeviceDescriptor = struct {
mode: ?Mode = null,
pub const DeviceOptions = struct {
mode: Mode = .output,
format: ?Format = null,
is_raw: ?bool = null,
channels: ?u8 = null,
@ -37,6 +37,28 @@ pub const DeviceDescriptor = struct {
name: ?[]const u8 = null,
};
pub const DeviceProperties = struct {
mode: Mode,
format: Format,
is_raw: bool,
channels: u8,
sample_rate: u32,
id: [:0]const u8,
name: []const u8,
pub fn intoConfig(properties: DeviceProperties) DeviceOptions {
return .{
.mode = properties.mode,
.format = properties.format,
.is_raw = properties.is_raw,
.channels = properties.channels,
.sample_rate = properties.sample_rate,
.id = properties.id,
.name = properties.name,
};
}
};
const Audio = @This();
backend: Backend,
@ -55,7 +77,7 @@ pub fn waitEvents(self: Audio) void {
self.backend.waitEvents();
}
pub fn requestDevice(self: Audio, allocator: std.mem.Allocator, config: DeviceDescriptor) Error!*Device {
pub fn requestDevice(self: Audio, allocator: std.mem.Allocator, config: Device.Options) Error!*Device {
return self.backend.requestDevice(allocator, config);
}
@ -88,9 +110,9 @@ test "connect to device from descriptor" {
defer a.deinit();
var iter = a.outputDeviceIterator();
var device_desc = (try iter.next()) orelse return error.NoDeviceFound;
var device_conf = (try iter.next()) orelse return error.NoDeviceFound;
const d = try a.requestDevice(std.testing.allocator, device_desc);
const d = try a.requestDevice(std.testing.allocator, device_conf);
defer d.deinit(std.testing.allocator);
}
@ -99,29 +121,14 @@ test "requestDevice behavior: null is_raw" {
defer a.deinit();
var iter = a.outputDeviceIterator();
var device_desc = (try iter.next()) orelse return error.NoDeviceFound;
var device_conf = (try iter.next()) orelse return error.NoDeviceFound;
const bad_desc = DeviceDescriptor{
const bad_conf = Device.Options{
.is_raw = null,
.mode = device_desc.mode,
.id = device_desc.id,
.mode = device_conf.mode,
.id = device_conf.id,
};
try testing.expectError(error.InvalidParameter, a.requestDevice(std.testing.allocator, bad_desc));
}
test "requestDevice behavior: null mode" {
const a = try init();
defer a.deinit();
var iter = a.outputDeviceIterator();
var device_desc = (try iter.next()) orelse return error.NoDeviceFound;
const bad_desc = DeviceDescriptor{
.is_raw = device_desc.is_raw,
.mode = null,
.id = device_desc.id,
};
try testing.expectError(error.InvalidParameter, a.requestDevice(std.testing.allocator, bad_desc));
try testing.expectError(error.InvalidParameter, a.requestDevice(std.testing.allocator, bad_conf));
}
test "requestDevice behavior: invalid id" {
@ -130,12 +137,12 @@ test "requestDevice behavior: invalid id" {
// defer a.deinit();
// var iter = a.outputDeviceIterator();
// var device_desc = (try iter.next()) orelse return error.NoDeviceFound;
// var device_conf = (try iter.next()) orelse return error.NoDeviceFound;
// const bad_desc = DeviceDescriptor{
// .is_raw = device_desc.is_raw,
// .mode = device_desc.mode,
// const bad_conf = Device.Options{
// .is_raw = device_conf.is_raw,
// .mode = device_conf.mode,
// .id = "wrong-id",
// };
// try testing.expectError(error.DeviceUnavailable, a.requestDevice(bad_desc));
// try testing.expectError(error.DeviceUnavailable, a.requestDevice(bad_conf));
}