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

sink,source: Avoid crash by not updating volume on shutdown

Browse source 
Sometimes the ALSA mixer can be modified during a point at shutdown
which causes a race condition trying to update the volume of an
unlinked sink.

Includes typo fix by our Chief Typo Spotter, Colin, and a clarifying
comment by me.

BugLink: http://bugs.launchpad.net/bugs/841968
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
David Henningsson 2011-09-12 12:57:20 +02:00 • committed by Arun Raghavan
parent 38be4a2d44
commit f8624a7876
4 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1212,6 +1212,9 @@ static int ctl_mixer_callback(snd_mixer_elem_t *elem, unsigned int mask) {
if (mask == SND_CTL_EVENT_MASK_REMOVE) if (mask == SND_CTL_EVENT_MASK_REMOVE)
return 0; return 0;
if (!PA_SINK_IS_LINKED(u->sink->state))
return 0;
if (u->sink->suspend_cause & PA_SUSPEND_SESSION) if (u->sink->suspend_cause & PA_SUSPEND_SESSION)
return 0; return 0;

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

@ -1063,6 +1063,9 @@ static int ctl_mixer_callback(snd_mixer_elem_t *elem, unsigned int mask) {
if (mask == SND_CTL_EVENT_MASK_REMOVE) if (mask == SND_CTL_EVENT_MASK_REMOVE)
return 0; return 0;
if (!PA_SOURCE_IS_LINKED(u->source->state))
return 0;
if (u->source->suspend_cause & PA_SUSPEND_SESSION) if (u->source->suspend_cause & PA_SUSPEND_SESSION)
return 0; return 0;

4
src/pulsecore/sink.c
View file

@ -2623,6 +2623,10 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
/* This message is sent from IO-thread and handled in main thread. */ /* This message is sent from IO-thread and handled in main thread. */
pa_assert_ctl_context(); pa_assert_ctl_context();
/* Make sure we're not messing with main thread when no longer linked */
if (!PA_SINK_IS_LINKED(s->state))
return 0;
pa_sink_get_volume(s, TRUE); pa_sink_get_volume(s, TRUE);
pa_sink_get_mute(s, TRUE); pa_sink_get_mute(s, TRUE);
return 0; return 0;

4
src/pulsecore/source.c
View file

@ -2045,6 +2045,10 @@ int pa_source_process_msg(pa_msgobject *object, int code, void *userdata, int64_
/* This message is sent from IO-thread and handled in main thread. */ /* This message is sent from IO-thread and handled in main thread. */
pa_assert_ctl_context(); pa_assert_ctl_context();
/* Make sure we're not messing with main thread when no longer linked */
if (!PA_SOURCE_IS_LINKED(s->state))
return 0;
pa_source_get_volume(s, TRUE); pa_source_get_volume(s, TRUE);
pa_source_get_mute(s, TRUE); pa_source_get_mute(s, TRUE);
return 0; return 0;