[Gnash-commit] /srv/bzr/gnash/trunk r10613: Oops, I broke builds *with* media in last commit, now fixed

[Sandro Santilli]

------------------------------------------------------------
revno: 10613
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Mon 2009-02-23 17:32:29 +0100
message:
  Oops, I broke builds *with* media in last commit, now fixed
modified:
  utilities/processor.cpp

=== modified file 'utilities/processor.cpp'
--- a/utilities/processor.cpp   2009-02-23 16:16:17 +0000
+++ b/utilities/processor.cpp   2009-02-23 16:32:29 +0000
@@ -341,22 +341,18 @@
     }
 
 
-#ifdef USE_FFMPEG
-    gnash::media::MediaHandler::set(
-            new gnash::media::ffmpeg::MediaHandlerFfmpeg() );
-    );
-#elif defined(USE_GST)
-    gnash::media::MediaHandler::set(
-            new gnash::media::gst::MediaHandlerGst()
-    );
-#else
-    //std::cerr << "Neither SOUND_SDL nor SOUND_GST defined" << std::endl;
-    //exit(1);
-#endif
-
+    std::auto_ptr<gnash::media::MediaHandler> mediaHandler;
     boost::shared_ptr<sound::sound_handler> soundHandler;
 
-    if ( gnash::media::MediaHandler::get() ) {
+#ifdef USE_FFMPEG
+    mediaHandler.reset( new gnash::media::ffmpeg::MediaHandlerFfmpeg() );
+#elif defined(USE_GST)
+    mediaHandler.reset( new gnash::media::gst::MediaHandlerGst() );
+#endif
+
+    if ( mediaHandler.get() )
+    {
+        gnash::media::MediaHandler::set(mediaHandler);
         soundHandler.reset( new sound::NullSoundHandler() );
     }