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

Initialise write_volume

Browse source 
The callback should also be reset in reset_calbacks().
The extra check in _volume_change_apply() is needed because when the sink is unlinked the callbacks are reset,
but there still may be pending volume changes.
This commit is contained in:
Maarten Bosmans 2011-08-15 20:19:40 +02:00 • committed by Colin Guthrie
parent 0ef7e5cb4c
commit 9256d9b7be
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pulsecore/sink.c
View file

@ -174,6 +174,7 @@ static void reset_callbacks(pa_sink *s) {
s->set_state = NULL; s->set_state = NULL;
s->get_volume = NULL; s->get_volume = NULL;
s->set_volume = NULL; s->set_volume = NULL;
s->write_volume = NULL;
s->get_mute = NULL; s->get_mute = NULL;
s->set_mute = NULL; s->set_mute = NULL;
s->request_rewind = NULL; s->request_rewind = NULL;
@ -3350,6 +3351,13 @@ pa_bool_t pa_sink_volume_change_apply(pa_sink *s, pa_usec_t *usec_to_next) {
pa_bool_t ret = FALSE; pa_bool_t ret = FALSE;
pa_assert(s); pa_assert(s);
if (!PA_SINK_IS_LINKED(s->state)) {
if (usec_to_next)
*usec_to_next = 0;
return ret;
}
pa_assert(s->write_volume); pa_assert(s->write_volume);
while (s->thread_info.volume_changes && now >= s->thread_info.volume_changes->at) { while (s->thread_info.volume_changes && now >= s->thread_info.volume_changes->at) {

8
src/pulsecore/source.c
View file

@ -144,6 +144,7 @@ static void reset_callbacks(pa_source *s) {
s->set_state = NULL; s->set_state = NULL;
s->get_volume = NULL; s->get_volume = NULL;
s->set_volume = NULL; s->set_volume = NULL;
s->write_volume = NULL;
s->get_mute = NULL; s->get_mute = NULL;
s->set_mute = NULL; s->set_mute = NULL;
s->update_requested_latency = NULL; s->update_requested_latency = NULL;
@ -2533,6 +2534,13 @@ pa_bool_t pa_source_volume_change_apply(pa_source *s, pa_usec_t *usec_to_next) {
pa_bool_t ret = FALSE; pa_bool_t ret = FALSE;
pa_assert(s); pa_assert(s);
if (!PA_SOURCE_IS_LINKED(s->state)) {
if (usec_to_next)
*usec_to_next = 0;
return ret;
}
pa_assert(s->write_volume); pa_assert(s->write_volume);
while (s->thread_info.volume_changes && now >= s->thread_info.volume_changes->at) { while (s->thread_info.volume_changes && now >= s->thread_info.volume_changes->at) {