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

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     08/02/08 23:48:02

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

Log message:
        Disable the seeking assistant mp3parse module for now. Add a small 
amount of error output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5599&r2=1.5600
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/gst/SoundGst.cpp?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5599
retrieving revision 1.5600
diff -u -b -r1.5599 -r1.5600
--- ChangeLog   8 Feb 2008 23:43:54 -0000       1.5599
+++ ChangeLog   8 Feb 2008 23:48:01 -0000       1.5600
@@ -1,3 +1,8 @@
+2008-02-08 Bastiaan Jacques <address@hidden>
+
+       * libmedia/gst/SoundGst.cpp: Disable the seeking assistant
+       mp3parse module for now. Add a small amount of error output.
+
 2008-02-09 Sandro Santilli <address@hidden>
 
        * testsuite/misc-ming.all/loadMovieTest.c: check that

Index: libmedia/gst/SoundGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/SoundGst.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libmedia/gst/SoundGst.cpp   8 Feb 2008 15:57:03 -0000       1.2
+++ libmedia/gst/SoundGst.cpp   8 Feb 2008 23:48:01 -0000       1.3
@@ -395,15 +395,18 @@
   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);
       
       GstElement* audioparse = gst_element_factory_make ("mp3parse", NULL);
       GstElement* actual_decoder = gstFindDecoder(src_caps, NULL);
       gst_bin_add_many(GST_BIN(decoder), audioparse, actual_decoder, NULL);
-      gst_element_link(audioparse, actual_decoder);
+      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");
@@ -414,7 +417,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?
   }
@@ -427,23 +430,27 @@
 
   GstElement* audiosink = gst_element_factory_make ("autoaudiosink", NULL);
   
-
+  gboolean success;
   if (decoder) {
   
     gst_bin_add_many(GST_BIN(_pipeline), _buffersrc, decoder, _volume,
                      audioconvert, audioresample, audiosink, NULL);
 
-    gst_element_link_many(_buffersrc, decoder, _volume, audioconvert,
+    success = gst_element_link_many(_buffersrc, decoder, _volume, audioconvert,
                           audioresample, audiosink, NULL);
   } else {    
     gst_bin_add_many(GST_BIN(_pipeline), _buffersrc,
                      audioconvert, audioresample, _volume, audiosink, NULL);
 
-    gst_element_link_many(_buffersrc, audioconvert, audioresample,
+    success = gst_element_link_many(_buffersrc, audioconvert, audioresample,
                           _volume, audiosink, NULL);
   
   }
   
+  if (!success) {
+    log_error(_("Failed to link Gstreamer elements."));
+  }  
+  
   gst_caps_unref(src_caps);
   
   if (!_volume || !audioconvert || !audioresample || !audiosink) {