rpms/rhythmbox/devel rb-0.12.0-use-decodebin2.patch, NONE, 1.1 rhythmbox.spec, 1.236, 1.237

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24550

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-0.12.0-use-decodebin2.patch 
Log Message:
* Tue Mar 24 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0-2
- Add patch to use decodebin2 instead of decodebin and fix
  playback problems with chained ogg streams (#446283)


rb-0.12.0-use-decodebin2.patch:

--- NEW FILE rb-0.12.0-use-decodebin2.patch ---
Index: backends/gstreamer/rb-encoder-gst.c
===================================================================
--- backends/gstreamer/rb-encoder-gst.c	(revision 6244)
+++ backends/gstreamer/rb-encoder-gst.c	(working copy)
@@ -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,
Index: backends/gstreamer/rb-player-gst-xfade.c
===================================================================
--- backends/gstreamer/rb-player-gst-xfade.c	(revision 6244)
+++ backends/gstreamer/rb-player-gst-xfade.c	(working copy)
@@ -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);
-	}
+	stream->decoder = gst_element_factory_make ("decodebin2", NULL);
 
 	if (stream->decoder == NULL) {
-		stream->decoder = gst_element_factory_make ("decodebin", 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),


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- rhythmbox.spec	19 Mar 2009 10:51:42 -0000	1.236
+++ rhythmbox.spec	24 Mar 2009 14:22:31 -0000	1.237
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.12.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -52,6 +52,8 @@
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=428034
 Patch0: rb-disable-power-plugin-by-default.patch
+# http://svn.gnome.org/viewvc/rhythmbox?view=revision&revision=6245
+Patch1: rb-0.12.0-use-decodebin2.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -222,6 +224,10 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Mar 24 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0-2
+- Add patch to use decodebin2 instead of decodebin and fix
+  playback problems with chained ogg streams (#446283)
+
 * Thu Mar 19 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0-1
 - Update to 0.12.0