[Gnash-commit] gnash ChangeLog testsuite/MovieTester.cpp tests...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/06/04 12:39:57

Modified files:
        .              : ChangeLog 
        testsuite      : MovieTester.cpp MovieTester.h 

Log message:
        * testsuite/MovieTester.{cpp,h}: register media handler.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6801&r2=1.6802
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.h?cvsroot=gnash&r1=1.39&r2=1.40

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6801
retrieving revision 1.6802
diff -u -b -r1.6801 -r1.6802
--- ChangeLog   4 Jun 2008 12:11:21 -0000       1.6801
+++ ChangeLog   4 Jun 2008 12:39:56 -0000       1.6802
@@ -1,3 +1,7 @@
+2008-06-04 Sandro Santilli <address@hidden>
+
+       * testsuite/MovieTester.{cpp,h}: register media handler.
+
 2008-06-04 Benjamin Wolsey <address@hidden>
 
        * server/stream.cpp: silence debug logging.

Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- testsuite/MovieTester.cpp   17 May 2008 08:43:24 -0000      1.72
+++ testsuite/MovieTester.cpp   4 Jun 2008 12:39:57 -0000       1.73
@@ -41,6 +41,13 @@
 #include "render_handler_cairo.h"
 #endif
 
+#include "MediaHandler.h"
+#ifdef SOUND_SDL
+# include "ffmpeg/MediaHandlerFfmpeg.h"
+#elif defined(SOUND_GST)
+# include "gst/MediaHandlerGst.h"
+#endif
+
 #include <cstdio>
 #include <string>
 #include <memory> // for auto_ptr
@@ -107,6 +114,9 @@
        // Initialize the sound handler(s)
        initTestingSoundHandlers();
 
+       // Initialize the testing media handlers
+       initTestingMediaHandlers();
+
        _movie_root = &(VM::init(*_movie_def, _clock).getRoot());
 
        // Initialize viewport size with the one advertised in the header
@@ -557,6 +567,24 @@
 }
 
 void
+MovieTester::initTestingMediaHandlers()
+{
+
+       std::auto_ptr<media::MediaHandler> handler;
+
+#ifdef SOUND_SDL
+       handler.reset( new gnash::media::MediaHandlerFfmpeg() );
+#elif defined(SOUND_GST)
+        handler.reset( new gnash::media::MediaHandlerGst() );
+#else
+       std::cerr << "Neigher SOUND_SDL nor SOUND_GST defined" << std::endl;
+       return;
+#endif
+
+       gnash::media::MediaHandler::set(handler);
+}
+
+void
 MovieTester::restart() 
 {
        _movie_root->clear(); // restart();

Index: testsuite/MovieTester.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- testsuite/MovieTester.h     2 Jun 2008 12:19:26 -0000       1.39
+++ testsuite/MovieTester.h     4 Jun 2008 12:39:57 -0000       1.40
@@ -284,6 +284,14 @@
        ///
        void initTestingSoundHandlers();
 
+       /// Initialize media handlers
+       //
+       /// For now this function initializes a single media handler,
+       /// the one enabled at configure time.
+       /// In the future it might initialize multiple ones (maybe)
+       ///
+       void initTestingMediaHandlers();
+
        /// Render the current movie to all testing renderers
        //
        /// This function calls movie_root::display internally