mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -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;
p = *pp;
pa_log_debug("Check Profile %s.", p->name);
/* Skip if fallback and already found something */
if (found_input && p->fallback_input)
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;
char *name; /* E g "Headphone" */
char *alsa_name; /* E g "Headphone Jack" */
bool has_control; /* is the jack itself present? */
bool plugged_in; /* is this jack currently plugged in? */
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:")) {
char *t;
t = pa_sprintf_malloc("plug:%s", d);
t = pa_sprintf_malloc("plug:SLAVE='%s'", d);
pa_xfree(d);
d = t;