[Gnash-commit] gnash ChangeLog configure.ac backend/sound_hand...

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/02/21 17:41:12

Modified files:
        .              : ChangeLog configure.ac 
        backend        : sound_handler_gst.cpp 
        macros         : ffmpeg.m4 

Log message:
         * configure.ac, macros/ffmpeg.m4: Another go at bug #16663.
         * backend/sound_handler_gst.cpp: Added warnings when using fluendos
           mp3 plugin for gstreamer, since it doesn't support soundstreams.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2424&r2=1.2425
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.260&r2=1.261
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2424
retrieving revision 1.2425
diff -u -b -r1.2424 -r1.2425
--- ChangeLog   21 Feb 2007 17:22:51 -0000      1.2424
+++ ChangeLog   21 Feb 2007 17:41:11 -0000      1.2425
@@ -1,3 +1,9 @@
+2007-02-21 Tomas Groth Christensen <address@hidden>
+
+       * configure.ac, macros/ffmpeg.m4: Another go at bug #16663.
+       * backend/sound_handler_gst.cpp: Added warnings when using fluendos
+         mp3 plugin for gstreamer, since it doesn't support soundstreams.
+
 2007-02-21 Sandro Santilli <address@hidden>
 
        * server/sprite_instance.cpp (do_actions): report actions

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -b -r1.260 -r1.261
--- configure.ac        21 Feb 2007 14:51:00 -0000      1.260
+++ configure.ac        21 Feb 2007 17:41:11 -0000      1.261
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.260 2007/02/21 14:51:00 tgc Exp $
+dnl $Id: configure.ac,v 1.261 2007/02/21 17:41:11 tgc Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1147,9 +1147,10 @@
   else
     if test x"$mp3_decoder" = x"ffmpeg"; then
       if test x${ffmpeg_version} != xok; then
-         echo "WARNING: You have version ${ffmpeg_version} of ffmpeg 
installed.\
-This version of ffmpeg may not work!\
-Version 51.29.0 or newer is highly recommended"
+         echo "ERROR: You have version ${ffmpeg_version} of ffmpeg installed. \
+This version of ffmpeg may not work! \
+Version 51.27.0 or newer is highly recommended"
+        nogo=true
       fi
       if test x"$FFMPEG_LIBS" != x; then
         echo "        MP3 support enabled through ffmpeg"

Index: backend/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- backend/sound_handler_gst.cpp       17 Nov 2006 19:24:57 -0000      1.30
+++ backend/sound_handler_gst.cpp       21 Feb 2007 17:41:11 -0000      1.31
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-/* $Id: sound_handler_gst.cpp,v 1.30 2006/11/17 19:24:57 tgc Exp $ */
+/* $Id: sound_handler_gst.cpp,v 1.31 2007/02/21 17:41:11 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -322,8 +322,10 @@
 
                gst_element->decoder = gst_element_factory_make ("mad", NULL);
                if (gst_element->decoder == NULL) gst_element->decoder = 
gst_element_factory_make ("ffdec_mp3", NULL);
-               if (gst_element->decoder == NULL) gst_element->decoder = 
gst_element_factory_make ("flump3dec", NULL);
-
+               if (gst_element->decoder == NULL) {
+                       gst_element->decoder = gst_element_factory_make 
("flump3dec", NULL);
+                       if (gst_element->decoder != NULL) 
gnash::log_warning("Fluendos mp3 plugin does not support flash streaming 
sounds.");
+               }
                // Check if the element was correctly created
                if (!gst_element->decoder) {
                        gnash::log_error("A gstreamer mp3-decoder element could 
not be created\n");

Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- macros/ffmpeg.m4    21 Feb 2007 14:51:01 -0000      1.30
+++ macros/ffmpeg.m4    21 Feb 2007 17:41:11 -0000      1.31
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: ffmpeg.m4,v 1.30 2007/02/21 14:51:01 tgc Exp $
+dnl $Id: ffmpeg.m4,v 1.31 2007/02/21 17:41:11 tgc Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -67,12 +67,14 @@
 dnl     fi
 dnl   fi
 
-  ffmpeg_num_version=`$EGREP "define LIBAVCODEC_VERSION " ${topdir}/avcodec.h 
| cut -d ' ' -f 8 | tr -d '.'`
-  ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${topdir}/avcodec.h | 
cut -d ' ' -f 8`
+  ffmpeg_num_version=`$EGREP "define LIBAVCODEC_VERSION " ${topdir}/avcodec.h 
| sed -e "s%[^0-9]%%g"`
+  ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${topdir}/avcodec.h | 
sed -e "s%[^0-9.]%%g"`
 
   if test x"${ffmpeg_version}" = x ; then
-    ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${topdir}/avcodec.h | 
cut -d ' ' -f 9`
-    ffmpeg_num_version=`$EGREP "define LIBAVCODEC_BUILD " ${topdir}/avcodec.h 
| cut -d ' ' -f 9`
+    ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${topdir}/avcodec.h | 
sed -e "s%[^0-9.]%%g"`
+    ffmpeg_num_version=`$EGREP "define LIBAVCODEC_BUILD " ${topdir}/avcodec.h 
| sed -e "s%[^0-9]%%g"`
+    AC_MSG_RESULT(${ffmpeg_version})
+    AC_MSG_RESULT(${ffmpeg_num_version})
   fi
 
 dnl   AC_EGREP_HEADER(avcodec_decode_audio2, ${topdir}/avcodec.h, 
[avfound=yes], [avfound=no])