[Gnash-commit] /srv/bzr/gnash/trunk r9873: Use the new Gstreamer preprocessor conditional.

[Bastiaan Jacques]

------------------------------------------------------------
revno: 9873
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Mon 2008-09-29 22:30:01 +0200
message:
  Use the new Gstreamer preprocessor conditional.
modified:
  testsuite/MovieTester.cpp
    ------------------------------------------------------------
    revno: 9857.1.7
    committer: Bastiaan Jacques <address@hidden>
    branch nick: gstreamer
    timestamp: Mon 2008-09-29 22:29:32 +0200
    message:
      Use the new Gstreamer preprocessor conditional.
    modified:
      testsuite/MovieTester.cpp

=== modified file 'testsuite/MovieTester.cpp'
--- a/testsuite/MovieTester.cpp 2008-09-23 14:49:55 +0000
+++ b/testsuite/MovieTester.cpp 2008-09-29 20:29:32 +0000
@@ -42,9 +42,9 @@
 #endif
 
 #include "MediaHandler.h"
-#ifdef SOUND_SDL
+#ifdef USE_FFMPEG
 # include "ffmpeg/MediaHandlerFfmpeg.h"
-#elif defined(SOUND_GST)
+#elif defined(USE_GST)
 # include "gst/MediaHandlerGst.h"
 #endif
 
@@ -567,9 +567,9 @@
 
        std::auto_ptr<media::MediaHandler> handler;
 
-#ifdef SOUND_SDL
+#ifdef USE_FFMPEG
        handler.reset( new gnash::media::MediaHandlerFfmpeg() );
-#elif defined(SOUND_GST)
+#elif defined(USE_GST)
         handler.reset( new gnash::media::MediaHandlerGst() );
 #else
        std::cerr << "Neigher SOUND_SDL nor SOUND_GST defined" << std::endl;