[Gnash-commit] gnash ChangeLog gui/gnash.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/26 19:01:45

Modified files:
        .              : ChangeLog 
        gui            : gnash.cpp 

Log message:
        * gui/gnash.cpp: use SOUND_GST and SOUND_SDL to switch between sound 
handlers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.530&r2=1.531
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -b -r1.530 -r1.531
--- ChangeLog   26 Jul 2006 17:24:41 -0000      1.530
+++ ChangeLog   26 Jul 2006 19:01:45 -0000      1.531
@@ -1,6 +1,8 @@
 
 2006-07-26 Sandro Santilli <address@hidden>
 
+       * gui/gnash.cpp: use SOUND_GST and SOUND_SDL to switch
+         between sound handlers.
        * utilities/Makefile.am: add CAIRO_LIBS.
        * macros/gtk2.m4: fixed typo
        * libbase/Makefile.am: don't build ogl.cpp when not using OPENGL

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gui/gnash.cpp       24 Jul 2006 13:30:50 -0000      1.16
+++ gui/gnash.cpp       26 Jul 2006 19:01:45 -0000      1.17
@@ -275,12 +275,12 @@
     std::auto_ptr<gnash::sound_handler>  sound;
 
     if (do_sound) {
-#ifdef HAVE_SDL_MIXER_H
+#ifdef SOUND_SDL
       sound = std::auto_ptr<gnash::sound_handler>
         (gnash::create_sound_handler_sdl());
       gnash::set_sound_handler(sound.get());
 #endif
-#ifdef HAVE_GST_GST_H
+#ifdef SOUND_GST
       sound = std::auto_ptr<gnash::sound_handler>
         (gnash::create_sound_handler_gst());
       gnash::set_sound_handler(sound.get());