mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-02 09:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: Move UCM port availability updating to the mixer code

Browse source 
Previously module-alsa-card assigned to pa_alsa_jack.plugged_in
directly, and then did the port availability updating manually. The
idea of pa_alsa_jack_set_plugged_in() is to move the availability
updating to the mixer infrastructure, where it really belongs.

Similarly, pa_alsa_jack.has_control was previously modified directly
from several places. The has_control field affects the port
availability, and pa_alsa_jack_set_has_control() takes care of
updating the availability.

For now, pa_alsa_jack_set_plugged_in() and
pa_alsa_jack_set_has_control() only update the port availability
when using UCM. My plan is to adapt the traditional mixer code later.
This commit is contained in:
Tanu Kaskinen 2015-05-04 21:03:43 +03:00
parent 40714b6bcc
commit c9557e6969
6 changed files with 112 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/modules/alsa/alsa-mixer.c
View file

@ -139,6 +139,36 @@ void pa_alsa_jack_free(pa_alsa_jack *jack) {
pa_xfree(jack);
}
void pa_alsa_jack_set_has_control(pa_alsa_jack *jack, bool has_control) {
pa_alsa_ucm_device *device;
unsigned idx;
pa_assert(jack);
if (has_control == jack->has_control)
return;
jack->has_control = has_control;
PA_DYNARRAY_FOREACH(device, jack->ucm_devices, idx)
pa_alsa_ucm_device_update_available(device);
}
void pa_alsa_jack_set_plugged_in(pa_alsa_jack *jack, bool plugged_in) {
pa_alsa_ucm_device *device;
unsigned idx;
pa_assert(jack);
if (plugged_in == jack->plugged_in)
return;
jack->plugged_in = plugged_in;
PA_DYNARRAY_FOREACH(device, jack->ucm_devices, idx)
pa_alsa_ucm_device_update_available(device);
}
void pa_alsa_jack_add_ucm_device(pa_alsa_jack *jack, pa_alsa_ucm_device *device) {
pa_assert(jack);
pa_assert(device);
@ -1755,10 +1785,13 @@ static int element_probe(pa_alsa_element *e, snd_mixer_t *m) {
}
static int jack_probe(pa_alsa_jack *j, snd_mixer_t *m) {
bool has_control;
pa_assert(j);
pa_assert(j->path);
j->has_control = pa_alsa_mixer_find(m, j->alsa_name, 0) != NULL;
has_control = pa_alsa_mixer_find(m, j->alsa_name, 0) != NULL;
pa_alsa_jack_set_has_control(j, has_control);
if (j->has_control) {
if (j->required_absent != PA_ALSA_REQUIRED_IGNORE)