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

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     08/02/09 08:39:04

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

Log message:
        Use mp3parse only if it's available, for instance in the absence of 
plugins-ugly.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5602
retrieving revision 1.5603
diff -u -b -r1.5602 -r1.5603
--- ChangeLog   9 Feb 2008 06:27:48 -0000       1.5602
+++ ChangeLog   9 Feb 2008 08:39:03 -0000       1.5603
@@ -1,5 +1,10 @@
 2008-02-08 Bastiaan Jacques <address@hidden>
 
+       * libmedia/gst/SoundGst.cpp: Use mp3parse only if it's available,
+       for instance in the absence of plugins-ugly.
+
+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.
 

Index: libmedia/gst/SoundGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/gst/SoundGst.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/gst/SoundGst.cpp   9 Feb 2008 06:27:49 -0000       1.5
+++ libmedia/gst/SoundGst.cpp   9 Feb 2008 08:39:04 -0000       1.6
@@ -395,13 +395,12 @@
   GstElement* decoder = NULL;
   
   if (needDecoder()) {
-    if (_info->getFormat() != AUDIO_CODEC_MP3) {
-      decoder = gstFindDecoder(src_caps, NULL);
+    if (_info->getFormat() == AUDIO_CODEC_MP3) {
+      GstElement* audioparse = gst_element_factory_make ("mp3parse", NULL);
+      if (audioparse) {
 
-    } 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);
       assert(gst_element_link(audioparse, actual_decoder));
@@ -414,6 +413,13 @@
       
       gst_object_unref (GST_OBJECT (srcpad));
       gst_object_unref (GST_OBJECT (sinkpad));
+      
+      } else {
+        decoder = gstFindDecoder(src_caps, NULL);
+      }
+    } else {
+    
+      decoder = gstFindDecoder(src_caps, NULL);
     }