[rhythmbox] xfade: handle buffering messages with no associated stream (bug #681178)
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] xfade: handle buffering messages with no associated stream (bug #681178)
- Date: Thu, 9 Aug 2012 22:01:05 +0000 (UTC)
commit f5e84114f7e99636f6e5d68a648b5d657fdeee91
Author: Tristin Celestin <tristin celestin gmail com>
Date: Fri Aug 10 07:59:16 2012 +1000
xfade: handle buffering messages with no associated stream (bug #681178)
backends/gstreamer/rb-player-gst-xfade.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/backends/gstreamer/rb-player-gst-xfade.c b/backends/gstreamer/rb-player-gst-xfade.c
index f07c13a..7c4a5fb 100644
--- a/backends/gstreamer/rb-player-gst-xfade.c
+++ b/backends/gstreamer/rb-player-gst-xfade.c
@@ -1849,6 +1849,10 @@ rb_player_gst_xfade_bus_cb (GstBus *bus, GstMessage *message, RBPlayerGstXFade *
g_warning ("Could not get value from BUFFERING message");
break;
}
+ if (stream == NULL) {
+ rb_debug ("got buffering message for unknown stream (%d)", progress);
+ break;
+ }
g_mutex_lock (&stream->lock);
if (progress >= 100) {
@@ -1900,12 +1904,7 @@ rb_player_gst_xfade_bus_cb (GstBus *bus, GstMessage *message, RBPlayerGstXFade *
}
}
g_mutex_unlock (&stream->lock);
-
- if (stream == NULL) {
- rb_debug ("got buffering message for unknown stream (%d)", progress);
- } else {
- _rb_player_emit_buffering (RB_PLAYER (player), stream->stream_data, progress);
- }
+ _rb_player_emit_buffering (RB_PLAYER (player), stream->stream_data, progress);
break;
}
case GST_MESSAGE_ELEMENT:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]