From 3a0948098f342213247d73aa7662662da72963cf Mon Sep 17 00:00:00 2001 From: Ali Chraghi Date: Tue, 11 Apr 2023 04:11:10 +0330 Subject: [PATCH] sysaudio: fix build errors on linux --- libs/sysaudio/src/alsa.zig | 4 ++++ libs/sysaudio/src/pulseaudio.zig | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libs/sysaudio/src/alsa.zig b/libs/sysaudio/src/alsa.zig index 71201e57..1d3b370f 100644 --- a/libs/sysaudio/src/alsa.zig +++ b/libs/sysaudio/src/alsa.zig @@ -698,6 +698,8 @@ pub fn fromAlsaChannel(pos: c_uint) !main.Channel.Id { c.SND_CHMAP_SL => .side_left, c.SND_CHMAP_SR => .side_right, c.SND_CHMAP_RC => .back_center, + c.SND_CHMAP_RLC => .back_left, + c.SND_CHMAP_RRC => .back_right, c.SND_CHMAP_FLC => .front_left_center, c.SND_CHMAP_FRC => .front_right_center, c.SND_CHMAP_TC => .top_center, @@ -721,6 +723,8 @@ pub fn toCHMAP(pos: main.Channel.Id) c_uint { .side_left => c.SND_CHMAP_SL, .side_right => c.SND_CHMAP_SR, .back_center => c.SND_CHMAP_RC, + .back_left => c.SND_CHMAP_RLC, + .back_right => c.SND_CHMAP_RRC, .front_left_center => c.SND_CHMAP_FLC, .front_right_center => c.SND_CHMAP_FRC, .top_center => c.SND_CHMAP_TC, diff --git a/libs/sysaudio/src/pulseaudio.zig b/libs/sysaudio/src/pulseaudio.zig index a4b06e70..beae37c9 100644 --- a/libs/sysaudio/src/pulseaudio.zig +++ b/libs/sysaudio/src/pulseaudio.zig @@ -607,6 +607,8 @@ pub fn fromPAChannelPos(pos: c.pa_channel_position_t) !main.Channel.Id { c.PA_CHANNEL_POSITION_FRONT_RIGHT => .front_right, // PA_CHANNEL_POSITION_RIGHT c.PA_CHANNEL_POSITION_FRONT_CENTER => .front_center, // PA_CHANNEL_POSITION_CENTER c.PA_CHANNEL_POSITION_REAR_CENTER => .back_center, + c.PA_CHANNEL_POSITION_REAR_LEFT => .back_left, + c.PA_CHANNEL_POSITION_REAR_RIGHT => .back_right, c.PA_CHANNEL_POSITION_LFE => .lfe, // PA_CHANNEL_POSITION_SUBWOOFER c.PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER => .front_left_center, c.PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER => .front_right_center, @@ -651,21 +653,23 @@ pub fn toPAChannelMap(channels: []const main.Channel) !c.pa_channel_map { fn toPAChannelPos(channel_id: main.Channel.Id) !c.pa_channel_position_t { return switch (channel_id) { + .lfe => c.PA_CHANNEL_POSITION_LFE, + .front_center => c.PA_CHANNEL_POSITION_FRONT_CENTER, .front_left => c.PA_CHANNEL_POSITION_FRONT_LEFT, .front_right => c.PA_CHANNEL_POSITION_FRONT_RIGHT, - .front_center => c.PA_CHANNEL_POSITION_FRONT_CENTER, - .lfe => c.PA_CHANNEL_POSITION_LFE, .front_left_center => c.PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER, .front_right_center => c.PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER, .back_center => c.PA_CHANNEL_POSITION_REAR_CENTER, + .back_left => c.PA_CHANNEL_POSITION_REAR_LEFT, + .back_right => c.PA_CHANNEL_POSITION_REAR_RIGHT, .side_left => c.PA_CHANNEL_POSITION_SIDE_LEFT, .side_right => c.PA_CHANNEL_POSITION_SIDE_RIGHT, .top_center => c.PA_CHANNEL_POSITION_TOP_CENTER, - .top_front_left => c.PA_CHANNEL_POSITION_TOP_FRONT_LEFT, .top_front_center => c.PA_CHANNEL_POSITION_TOP_FRONT_CENTER, + .top_front_left => c.PA_CHANNEL_POSITION_TOP_FRONT_LEFT, .top_front_right => c.PA_CHANNEL_POSITION_TOP_FRONT_RIGHT, - .top_back_left => c.PA_CHANNEL_POSITION_TOP_REAR_LEFT, .top_back_center => c.PA_CHANNEL_POSITION_TOP_REAR_CENTER, + .top_back_left => c.PA_CHANNEL_POSITION_TOP_REAR_LEFT, .top_back_right => c.PA_CHANNEL_POSITION_TOP_REAR_RIGHT, }; }