rhythmbox r6077 - in trunk: . backends/gstreamer

[jmatthew svn gnome org]

Author: jmatthew
Date: Sat Nov 22 23:58:16 2008
New Revision: 6077
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6077&view=rev

Log:
2008-11-23  Jonathan Matthew  <jonathan d14n org>

	* backends/gstreamer/rb-player-gst-xfade.c: (link_unblocked_cb),
	(stream_src_blocked_cb):
	Take the stream list lock before processing pad block callbacks, since
	they seem to occur simultaneously from multiple threads sometimes.


Modified:
   trunk/ChangeLog
   trunk/backends/gstreamer/rb-player-gst-xfade.c

Modified: trunk/backends/gstreamer/rb-player-gst-xfade.c
==============================================================================
--- trunk/backends/gstreamer/rb-player-gst-xfade.c	(original)
+++ trunk/backends/gstreamer/rb-player-gst-xfade.c	Sat Nov 22 23:58:16 2008
@@ -1074,7 +1074,7 @@
 	g_static_rec_mutex_lock (&stream->player->priv->stream_list_lock);
 
 	/* sometimes we seem to get called twice */
-	if (stream->state == FADING_IN || stream->state == PLAYING) {
+	if (stream->src_blocked == FALSE) {
 		g_static_rec_mutex_unlock (&stream->player->priv->stream_list_lock);
 		return;
 	}
@@ -2407,7 +2407,15 @@
 stream_src_blocked_cb (GstPad *pad, gboolean blocked, RBXFadeStream *stream)
 {
 	GError *error = NULL;
+
+	g_static_rec_mutex_lock (&stream->player->priv->stream_list_lock);
+	if (stream->src_blocked) {
+		rb_debug ("stream %s already blocked", stream->uri);
+		g_static_rec_mutex_unlock (&stream->player->priv->stream_list_lock);
+		return;
+	}
 	stream->src_blocked = TRUE;
+	g_static_rec_mutex_unlock (&stream->player->priv->stream_list_lock);
 
 	g_object_set (stream->preroll,
 		      "min-threshold-time", G_GINT64_CONSTANT (0),