summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünter Merz <lotan_rm@hotmail.com>2010-08-21 16:20:22 +0000
committerGünter Merz <lotan_rm@hotmail.com>2010-08-21 16:20:22 +0000
commit7aa4e6782cd2e28c3d57d30959e408bdc5e75ba0 (patch)
tree3ee22c435186e2940de0e744ed86822f23f3be92
parent6673af0c8f7f124d88aa2a99056a34984912d85d (diff)
downloadxine-lib-7aa4e6782cd2e28c3d57d30959e408bdc5e75ba0.tar.gz
xine-lib-7aa4e6782cd2e28c3d57d30959e408bdc5e75ba0.tar.bz2
Pulseaudio volume control feedback (stream end)
During channel changes, the audio stream ends and a new stream begins. This in turn can lead to 'pa_stream_get_index' ending up in an assertion. Because of that, a check if there is a stream is a good idea.
-rw-r--r--src/audio_out/audio_pulse_out.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/audio_out/audio_pulse_out.c b/src/audio_out/audio_pulse_out.c
index ccb780d0d..ae74a57bc 100644
--- a/src/audio_out/audio_pulse_out.c
+++ b/src/audio_out/audio_pulse_out.c
@@ -267,6 +267,9 @@ static void __xine_pa_context_subscribe_callback(pa_context *c,
pulse_driver_t * this = (pulse_driver_t*) this_gen;
int index;
+ if (this->stream == NULL)
+ return;
+
index = pa_stream_get_index(this->stream);
if (index != idx)