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

Fix deferred volume not being applied if sink is closed

Browse source 
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
David Henningsson 2011-10-13 17:30:39 +02:00 • committed by Arun Raghavan
parent bb4b8f896e
commit ca6057316d
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1751,8 +1751,12 @@ static void thread_func(void *userdata) {
if (u->sink->flags & PA_SINK_DEFERRED_VOLUME) { if (u->sink->flags & PA_SINK_DEFERRED_VOLUME) {
pa_usec_t volume_sleep; pa_usec_t volume_sleep;
pa_sink_volume_change_apply(u->sink, &volume_sleep); pa_sink_volume_change_apply(u->sink, &volume_sleep);
if (volume_sleep > 0) if (volume_sleep > 0) {
if (rtpoll_sleep > 0)
rtpoll_sleep = PA_MIN(volume_sleep, rtpoll_sleep); rtpoll_sleep = PA_MIN(volume_sleep, rtpoll_sleep);
else
rtpoll_sleep = volume_sleep;
}
} }
if (rtpoll_sleep > 0) if (rtpoll_sleep > 0)

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

@ -1452,8 +1452,12 @@ static void thread_func(void *userdata) {
if (u->source->flags & PA_SOURCE_DEFERRED_VOLUME) { if (u->source->flags & PA_SOURCE_DEFERRED_VOLUME) {
pa_usec_t volume_sleep; pa_usec_t volume_sleep;
pa_source_volume_change_apply(u->source, &volume_sleep); pa_source_volume_change_apply(u->source, &volume_sleep);
if (volume_sleep > 0) if (volume_sleep > 0) {
if (rtpoll_sleep > 0)
rtpoll_sleep = PA_MIN(volume_sleep, rtpoll_sleep); rtpoll_sleep = PA_MIN(volume_sleep, rtpoll_sleep);
else
rtpoll_sleep = volume_sleep;
}
} }
if (rtpoll_sleep > 0) if (rtpoll_sleep > 0)