[Gnash-commit] gnash ./ChangeLog backend/sound_handler_sdl.cpp...

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Tomas Groth <address@hidden>    06/03/18 12:22:59

Modified files:
        .              : ChangeLog 
        backend        : sound_handler_sdl.cpp 
        macros         : docbook.m4 

Log message:
        Make mp3-support depend on HAVE_MAD_H instead of GAMESWF_MP3_SUPPORT . 
Include the J2REDIR enviroment variable in the list of where java could be.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.186&tr2=1.187&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/sound_handler_sdl.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/docbook.m4.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.186 gnash/ChangeLog:1.187
--- gnash/ChangeLog:1.186       Sat Mar 11 20:46:23 2006
+++ gnash/ChangeLog     Sat Mar 18 12:22:59 2006
@@ -1,3 +1,10 @@
+2006-03-18  Tomas Groth Christensen  <address@hidden>
+
+       * backend/sound_handler_sdl.cpp: Make mp3-support depend on
+       HAVE_MAD_H instead of GAMESWF_MP3_SUPPORT.
+       * macros/docbook.m4: Include the J2REDIR enviroment variable
+       in the list of where java could be.
+       
 2006-03-11  Rob Savoye  <address@hidden>
 
        * doc/C/internals.xml: Add section on the new debug logging
Index: gnash/backend/sound_handler_sdl.cpp
diff -u gnash/backend/sound_handler_sdl.cpp:1.6 
gnash/backend/sound_handler_sdl.cpp:1.7
--- gnash/backend/sound_handler_sdl.cpp:1.6     Sat Feb 25 03:54:03 2006
+++ gnash/backend/sound_handler_sdl.cpp Sat Mar 18 12:22:59 2006
@@ -129,7 +129,7 @@
                        break;
 
                case FORMAT_MP3:
-#ifdef GAMESWF_MP3_SUPPORT
+#ifdef HAVE_MAD_H
                        extern void convert_mp3_data(Sint16 **adjusted_data, 
int *adjusted_size, void *data, const int sample_count, const int sample_size, 
const int sample_rate, const bool stereo);
                        if (1) {
                                Sint16* x_adjusted_data = 0;
Index: gnash/macros/docbook.m4
diff -u gnash/macros/docbook.m4:1.13 gnash/macros/docbook.m4:1.14
--- gnash/macros/docbook.m4:1.13        Thu Mar  9 19:29:06 2006
+++ gnash/macros/docbook.m4     Sat Mar 18 12:22:59 2006
@@ -72,7 +72,7 @@
       AC_MSG_WARN([No fop.sh found! PDF format files can't be generated])
     fi
 
-    dirlist="/usr/lib/jre /usr/jre /opt/local/Java/JavaSDK ~/ReQuest/jre"
+    dirlist="/usr/lib/jre /usr/jre /opt/local/Java/JavaSDK ~/ReQuest/jre 
$J2REDIR"
     JAVA=""
     for i in $dirlist; do
       if test -f $i/bin/java; then