rhythmbox r6245 - in trunk: . backends/gstreamer

[hadess svn gnome org]

Author: hadess
Date: Tue Mar 24 14:18:54 2009
New Revision: 6245
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6245&view=rev

Log:
2009-03-24  Bastien Nocera  <hadess hadess net>

	* backends/gstreamer/rb-encoder-gst.c (add_decoding_pipeline):
	* backends/gstreamer/rb-player-gst-xfade.c (create_stream):
	Use decodebin2 instead of decodebin, fixed playback of chained ogg
	streams



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

Modified: trunk/backends/gstreamer/rb-encoder-gst.c
==============================================================================
--- trunk/backends/gstreamer/rb-encoder-gst.c	(original)
+++ trunk/backends/gstreamer/rb-encoder-gst.c	Tue Mar 24 14:18:54 2009
@@ -534,7 +534,7 @@
 	g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
 	encoder->priv->transcoding = TRUE;
-	decodebin = gst_element_factory_make ("decodebin", NULL);
+	decodebin = gst_element_factory_make ("decodebin2", NULL);
 	if (decodebin == NULL) {
 		g_set_error (error,
 				RB_ENCODER_ERROR,

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	Tue Mar 24 14:18:54 2009
@@ -52,7 +52,7 @@
  *
  * we have a single output bin, beginning with an adder.
  * connected to this are a number of stream bins, consisting of a
- * source, decodebin, audio convert/resample, and a volume element used
+ * source, decodebin2, audio convert/resample, and a volume element used
  * for fading in and out.  (might be interesting to replace those with
  * high/low pass filter elements?)
  *
@@ -1897,7 +1897,7 @@
 
 }
 
-/* links decodebin src pads to the rest of the output pipeline */
+/* links decodebin2 src pads to the rest of the output pipeline */
 static void
 stream_new_decoded_pad_cb (GstElement *decoder, GstPad *pad, gboolean last, RBXFadeStream *stream)
 {
@@ -2025,7 +2025,7 @@
 /*
  * stream playback bin:
  *
- * src [ ! queue ] ! decodebin ! audioconvert ! audioresample ! caps ! queue ! volume
+ * src [ ! queue ] ! decodebin2 ! audioconvert ! audioresample ! caps ! queue ! volume
  *
  * the first queue is only added for non-local streams.  the thresholds
  * and such are probably going to be configurable at some point,
@@ -2094,22 +2094,16 @@
 		}
 	}
 
-	if (g_getenv ("USE_DECODEBIN2") != NULL) {
-		stream->decoder = gst_element_factory_make ("decodebin2", NULL);
-	}
-
-	if (stream->decoder == NULL) {
-		stream->decoder = gst_element_factory_make ("decodebin", NULL);
-	}
+	stream->decoder = gst_element_factory_make ("decodebin2", NULL);
 
 	if (stream->decoder == NULL) {
-		rb_debug ("unable to create decodebin");
+		rb_debug ("unable to create decodebin2");
 		g_object_unref (stream);
 		return NULL;
 	}
 	gst_object_ref (stream->decoder);
 
-	/* connect decodebin to audioconvert when it creates its output pad */
+	/* connect decodebin2 to audioconvert when it creates its output pad */
 	g_signal_connect_object (stream->decoder,
 				 "new-decoded-pad",
 				 G_CALLBACK (stream_new_decoded_pad_cb),