rhythmbox r6098 - in trunk: . backends/gstreamer

[jmatthew svn gnome org]

Author: jmatthew
Date: Sun Dec 14 22:44:22 2008
New Revision: 6098
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6098&view=rev

Log:
2008-12-15  Jonathan Matthew  <jonathan d14n org>

	* backends/gstreamer/rb-player-gst-xfade.c: (create_stream):
	Put the per-stream volume element back where it was.  Moving it breaks
	fading out (mostly) and doesn't really fix the problem it was supposed
	to fix.


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	Sun Dec 14 22:44:22 2008
@@ -2200,8 +2200,8 @@
 				  stream->audioconvert,
 				  stream->audioresample,
 				  stream->capsfilter,
-				  stream->volume,
 				  stream->preroll,
+				  stream->volume,
 				  NULL);
 		gst_element_link_many (stream->source,
 				       stream->queue,
@@ -2210,8 +2210,8 @@
 		gst_element_link_many (stream->audioconvert,
 				       stream->audioresample,
 				       stream->capsfilter,
-				       stream->volume,
 				       stream->preroll,
+				       stream->volume,
 				       NULL);
 	} else {
 		gst_bin_add_many (GST_BIN (stream->bin),
@@ -2220,8 +2220,8 @@
 				  stream->audioconvert,
 				  stream->audioresample,
 				  stream->capsfilter,
-				  stream->volume,
 				  stream->preroll,
+				  stream->volume,
 				  NULL);
 		gst_element_link_many (stream->source,
 				       stream->decoder,
@@ -2229,8 +2229,8 @@
 		gst_element_link_many (stream->audioconvert,
 				       stream->audioresample,
 				       stream->capsfilter,
-				       stream->volume,
 				       stream->preroll,
+				       stream->volume,
 				       NULL);
 	}
 
@@ -2242,7 +2242,7 @@
 
 		identity = gst_element_factory_make ("identity", NULL);
 		gst_bin_add (GST_BIN (stream->bin), identity);
-		gst_element_link (stream->preroll, identity);
+		gst_element_link (stream->volume, identity);
 		if (rb_debug_matches ("check-imperfect-timestamp", __FILE__)) {
 			g_object_set (identity, "check-imperfect-timestamp", TRUE, NULL);
 		}
@@ -2252,7 +2252,7 @@
 
 		stream->src_pad = gst_element_get_pad (identity, "src");
 	} else {
-		stream->src_pad = gst_element_get_pad (stream->preroll, "src");
+		stream->src_pad = gst_element_get_pad (stream->volume, "src");
 	}
 
 	/* ghost the stream src pad up to the bin */