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

alsa: move pa_alsa_setting_select close to pa_alsa_path_select

Browse source 
Move pa_alsa_setting_select call just after the pa_alsa_path_select in
[sink | source]_set_port_cb functions as there is no dependency to volume
calculations that are done between these two calls. Idea here is to make
possible to merge these two functions since they are called together from
other places too.
This commit is contained in:
Jarkko Nikula 2012-03-22 11:29:11 +02:00 • committed by Tanu Kaskinen
parent 8417cac4f6
commit fbb13a0dc6
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/alsa/alsa-sink.c
View file

@ -1463,11 +1463,11 @@ static int sink_set_port_cb(pa_sink *s, pa_device_port *p) {
pa_assert_se(u->mixer_path = data->path);
pa_alsa_path_select(u->mixer_path, u->mixer_handle, s->muted);
mixer_volume_init(u);
if (data->setting)
pa_alsa_setting_select(data->setting, u->mixer_handle);
mixer_volume_init(u);
if (s->set_mute)
s->set_mute(s);
if (s->flags & PA_SINK_DEFERRED_VOLUME) {

4
src/modules/alsa/alsa-source.c
View file

@ -1366,11 +1366,11 @@ static int source_set_port_cb(pa_source *s, pa_device_port *p) {
pa_assert_se(u->mixer_path = data->path);
pa_alsa_path_select(u->mixer_path, u->mixer_handle, s->muted);
mixer_volume_init(u);
if (data->setting)
pa_alsa_setting_select(data->setting, u->mixer_handle);
mixer_volume_init(u);
if (s->set_mute)
s->set_mute(s);
if (s->flags & PA_SOURCE_DEFERRED_VOLUME) {