[Gnash-commit] gnash ChangeLog libmedia/gst/SoundGst.cpp

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     08/02/09 06:27:50

Modified files:
        .              : ChangeLog 
        libmedia/gst   : SoundGst.cpp 

Log message:
        Make sure source and sink pad actually reflect their names on the bin 
used for mp3parse.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5601&r2=1.5602
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/SoundGst.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5601
retrieving revision 1.5602
diff -u -b -r1.5601 -r1.5602
--- ChangeLog   9 Feb 2008 00:01:46 -0000       1.5601
+++ ChangeLog   9 Feb 2008 06:27:48 -0000       1.5602
@@ -1,5 +1,10 @@
 2008-02-08 Bastiaan Jacques <address@hidden>
 
+       * libmedia/gst/SoundGst.cpp: Make sure source and sink pad
+       actually reflect their names on the bin used for mp3parse.
+
+2008-02-08 Bastiaan Jacques <address@hidden>
+
        * libmedia/gst/SoundGst.cpp: Shuffle linking order so that
        volume will happen after conversion.
 

Index: libmedia/gst/SoundGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/SoundGst.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/gst/SoundGst.cpp   9 Feb 2008 00:01:46 -0000       1.4
+++ libmedia/gst/SoundGst.cpp   9 Feb 2008 06:27:49 -0000       1.5
@@ -395,11 +395,9 @@
   GstElement* decoder = NULL;
   
   if (needDecoder()) {
-#if 0
     if (_info->getFormat() != AUDIO_CODEC_MP3) {
-#endif
       decoder = gstFindDecoder(src_caps, NULL);
-#if 0
+
     } else {
       decoder = gst_bin_new(NULL);
       
@@ -408,8 +406,8 @@
       gst_bin_add_many(GST_BIN(decoder), audioparse, actual_decoder, NULL);
       assert(gst_element_link(audioparse, actual_decoder));
       
-      GstPad* srcpad = gst_element_get_static_pad (audioparse, "src");
-      GstPad* sinkpad = gst_element_get_static_pad (actual_decoder, "sink");
+      GstPad* sinkpad = gst_element_get_static_pad (audioparse, "sink");
+      GstPad* srcpad = gst_element_get_static_pad (actual_decoder, "src");
       
       gst_element_add_pad (decoder, gst_ghost_pad_new ("sink", sinkpad));
       gst_element_add_pad (decoder, gst_ghost_pad_new ("src", srcpad));
@@ -417,7 +415,7 @@
       gst_object_unref (GST_OBJECT (srcpad));
       gst_object_unref (GST_OBJECT (sinkpad));
     }
-#endif
+
     
     // FIXME: if we fail to find a decoder, should we stop here?
   }