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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/06/06 13:15:17

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

Log message:
                * testsuite/MovieTester.{cpp,h}: Don't abort if sound support 
wasn't
                  compiled in. Add a canTestSound() method to query that 
capability.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3469&r2=1.3470
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.h?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3469
retrieving revision 1.3470
diff -u -b -r1.3469 -r1.3470
--- ChangeLog   6 Jun 2007 12:57:32 -0000       1.3469
+++ ChangeLog   6 Jun 2007 13:15:16 -0000       1.3470
@@ -1,5 +1,10 @@
 2007-06-06 Sandro Santilli <address@hidden>
 
+       * testsuite/MovieTester.{cpp,h}: Don't abort if sound support wasn't
+         compiled in. Add a canTestSound() method to query that capability.
+
+2007-06-06 Sandro Santilli <address@hidden>
+
        * configure.ac: If no --enable-media was specified, use the first
          detected one in this order: ffmpeg/gst/mad. This is to allow
          ./configure with no args to be more failsafe (useful on 'make

Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- testsuite/MovieTester.cpp   5 Jun 2007 13:07:01 -0000       1.39
+++ testsuite/MovieTester.cpp   6 Jun 2007 13:15:17 -0000       1.40
@@ -357,12 +357,14 @@
 int
 MovieTester::soundsStarted()
 {
+       if ( ! _sound_handler ) return 0;
        return _sound_handler->numSoundsStarted();
 }
 
 int
 MovieTester::soundsStopped()
 {
+       if ( ! _sound_handler ) return 0;
        return _sound_handler->numSoundsStopped();
 }
 
@@ -450,7 +452,8 @@
         _sound_handler.reset( gnash::create_sound_handler_gst() );
 #else
        cerr << "Neigher SOUND_SDL nor SOUND_GST defined" << endl;
-       exit(1);
+       return;
+       //exit(1);
 #endif
 
        gnash::set_sound_handler(_sound_handler.get());

Index: testsuite/MovieTester.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- testsuite/MovieTester.h     4 Jun 2007 17:16:26 -0000       1.23
+++ testsuite/MovieTester.h     6 Jun 2007 13:15:17 -0000       1.24
@@ -75,6 +75,12 @@
        /// Return the underlying render handler
        render_handler& getRenderer() const { return *_renderer; }
 
+       /// Return true if this build of MovieTester supports sound testing
+       //
+       /// Sound will be supported as long as a sound handler was compiled in.
+       ///
+       bool canTestSound() const { return _sound_handler.get() != NULL; }
+
 private:
 
        std::string _name;
@@ -210,10 +216,16 @@
        /// handles mouse events
        bool isMouseOverMouseEntity();
 
-       /// Return the number of times a sound has been stopped.
+       /// \brief
+       /// Return the number of times a sound has been stopped,
+       /// or 0 if sound testing is not supported. See canTestSound().
+       //
        int soundsStopped();
 
-       /// Return the number of times a sound has been started.
+       /// \brief
+       /// Return the number of times a sound has been started,
+       /// or 0 if sound testing is not supported. See canTestSound().
+       //
        int soundsStarted();
 
 private: