mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: sync with pulseaudio

Browse source
This commit is contained in:
Wim Taymans 2021-02-25 10:28:25 +01:00
parent 7cf07da392
commit 20eb61b882
7 changed files with 135 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spa/plugins/alsa/acp/alsa-mixer.c
View file

@ -5158,6 +5158,8 @@ void pa_alsa_profile_set_probe(
uint32_t idx; uint32_t idx;
p = *pp; p = *pp;
pa_log_debug("Check Profile %s.", p->name);
/* Skip if fallback and already found something */ /* Skip if fallback and already found something */
if (found_input && p->fallback_input) if (found_input && p->fallback_input)
continue; continue;

1
spa/plugins/alsa/acp/alsa-mixer.h
View file

@ -180,7 +180,6 @@ struct pa_alsa_jack {
struct pa_alsa_mixer_id alsa_id; struct pa_alsa_mixer_id alsa_id;
char *name; /* E g "Headphone" */ char *name; /* E g "Headphone" */
char *alsa_name; /* E g "Headphone Jack" */
bool has_control; /* is the jack itself present? */ bool has_control; /* is the jack itself present? */
bool plugged_in; /* is this jack currently plugged in? */ bool plugged_in; /* is this jack currently plugged in? */
snd_mixer_elem_t *melem; /* Jack detection handle */ snd_mixer_elem_t *melem; /* Jack detection handle */

2
spa/plugins/alsa/acp/alsa-util.c
View file

@ -717,7 +717,7 @@ snd_pcm_t *pa_alsa_open_by_device_string(
if (!pa_startswith(d, "plug:") && !pa_startswith(d, "plughw:")) { if (!pa_startswith(d, "plug:") && !pa_startswith(d, "plughw:")) {
char *t; char *t;
t = pa_sprintf_malloc("plug:%s", d); t = pa_sprintf_malloc("plug:SLAVE='%s'", d);
pa_xfree(d); pa_xfree(d);
d = t; d = t;

12
spa/plugins/alsa/mixer/paths/hdmi-output-10.conf Normal file
View file

@ -0,0 +1,12 @@
[General]
description = HDMI / DisplayPort 11
type = hdmi
priority = 49
eld-device = auto
[Properties]
device.icon_name = video-display
[Jack HDMI/DP]
append-pcm-to-name = yes
required = ignore

12
spa/plugins/alsa/mixer/paths/hdmi-output-8.conf Normal file
View file

@ -0,0 +1,12 @@
[General]
description = HDMI / DisplayPort 9
type = hdmi
priority = 51
eld-device = auto
[Properties]
device.icon_name = video-display
[Jack HDMI/DP]
append-pcm-to-name = yes
required = ignore

12
spa/plugins/alsa/mixer/paths/hdmi-output-9.conf Normal file
View file

@ -0,0 +1,12 @@
[General]
description = HDMI / DisplayPort 10
type = hdmi
priority = 50
eld-device = auto
[Properties]
device.icon_name = video-display
[Jack HDMI/DP]
append-pcm-to-name = yes
required = ignore

96
spa/plugins/alsa/mixer/profile-sets/default.conf
View file

@ -461,6 +461,102 @@ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
priority = 6 priority = 6
direction = output direction = output
[Mapping hdmi-stereo-extra8]
description = Digital Stereo (HDMI 9)
device-strings = hdmi:%f,8
paths-output = hdmi-output-8
channel-map = left,right
priority = 7
direction = output
[Mapping hdmi-surround-extra8]
description = Digital Surround 5.1 (HDMI 9)
device-strings = hdmi:%f,8
paths-output = hdmi-output-8
channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
priority = 6
direction = output
[Mapping hdmi-surround71-extra8]
description = Digital Surround 7.1 (HDMI 9)
device-strings = hdmi:%f,8
paths-output = hdmi-output-8
channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
priority = 6
direction = output
[Mapping hdmi-dts-surround-extra8]
description = Digital Surround 5.1 (HDMI 9/DTS)
device-strings = dcahdmi:%f,8
paths-output = hdmi-output-8
channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
priority = 6
direction = output
[Mapping hdmi-stereo-extra9]
description = Digital Stereo (HDMI 10)
device-strings = hdmi:%f,9
paths-output = hdmi-output-9
channel-map = left,right
priority = 7
direction = output
[Mapping hdmi-surround-extra9]
description = Digital Surround 5.1 (HDMI 10)
device-strings = hdmi:%f,9
paths-output = hdmi-output-9
channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
priority = 6
direction = output
[Mapping hdmi-surround71-extra9]
description = Digital Surround 7.1 (HDMI 10)
device-strings = hdmi:%f,9
paths-output = hdmi-output-9
channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
priority = 6
direction = output
[Mapping hdmi-dts-surround-extra9]
description = Digital Surround 5.1 (HDMI 10/DTS)
device-strings = dcahdmi:%f,9
paths-output = hdmi-output-9
channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
priority = 6
direction = output
[Mapping hdmi-stereo-extra10]
description = Digital Stereo (HDMI 11)
device-strings = hdmi:%f,10
paths-output = hdmi-output-10
channel-map = left,right
priority = 7
direction = output
[Mapping hdmi-surround-extra10]
description = Digital Surround 5.1 (HDMI 11)
device-strings = hdmi:%f,10
paths-output = hdmi-output-10
channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
priority = 6
direction = output
[Mapping hdmi-surround71-extra10]
description = Digital Surround 7.1 (HDMI 11)
device-strings = hdmi:%f,10
paths-output = hdmi-output-10
channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
priority = 6
direction = output
[Mapping hdmi-dts-surround-extra10]
description = Digital Surround 5.1 (HDMI 11/DTS)
device-strings = dcahdmi:%f,10
paths-output = hdmi-output-10
channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
priority = 6
direction = output
[Mapping multichannel-output] [Mapping multichannel-output]
device-strings = hw:%f device-strings = hw:%f
channel-map = left,right,rear-left,rear-right channel-map = left,right,rear-left,rear-right