[Gnash-commit] /srv/bzr/gnash/trunk r9530: Fix 'make check' and runs with sound disabled

[Sandro Santilli]

------------------------------------------------------------
revno: 9530
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Wed 2008-07-23 22:29:35 +0200
message:
  Fix 'make check' and runs with sound disabled
modified:
  gui/gui.cpp
  testsuite/libbase/Makefile.am
    ------------------------------------------------------------
    revno: 9528.1.1
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Wed 2008-07-23 22:23:52 +0200
    message:
      Don't try to pause/unpause sound if no sound handler was registered.
      Should fix bug #23918.
    modified:
      gui/gui.cpp
    ------------------------------------------------------------
    revno: 9528.1.2
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Wed 2008-07-23 22:24:12 +0200
    message:
      CurlStreamTest was never meant to be automatically run, was fine
      while replicating automatic tests list in TEST_CASES, but I agree
      reusing check_PROGRAMS is easier to maintain so I just commented out
      the CurlStreamTest build lines for now
    modified:
      testsuite/libbase/Makefile.am

=== modified file 'gui/gui.cpp'
--- a/gui/gui.cpp       2008-07-19 11:13:08 +0000
+++ b/gui/gui.cpp       2008-07-23 20:23:52 +0000
@@ -858,7 +858,7 @@
     else
     {
         media::sound_handler* s = get_sound_handler();
-        s->unpause();
+        if ( s ) s->unpause();
     }
 
     playHook ();
@@ -873,7 +873,7 @@
     _stopped = true;
 
     media::sound_handler* s = get_sound_handler();
-    s->pause();
+    if ( s ) s->pause();
 
     stopHook();
 }
@@ -888,7 +888,7 @@
     else
     {
        media::sound_handler* s = get_sound_handler();
-       s->pause();
+       if ( s ) s->pause();
         _stopped = true;
     }
 }
@@ -913,7 +913,7 @@
     _stage->set_background_alpha(background ? 1.0f : 0.05f);
 
     media::sound_handler* s = get_sound_handler();
-    s->unpause();
+    if ( s ) s->unpause();
     _started = true;
 }
 

=== modified file 'testsuite/libbase/Makefile.am'
--- a/testsuite/libbase/Makefile.am     2008-07-23 08:59:01 +0000
+++ b/testsuite/libbase/Makefile.am     2008-07-23 20:24:12 +0000
@@ -34,6 +34,14 @@
 
 abs_builddir=`(cd $(top_builddir)/testsuite/libbase; pwd)`
 
+CLEANFILES = \
+       testrun.sum \
+       testrun.log \
+       gnash-dbg.log \
+       site.exp.bak \
+       NoSeekFileTestCache \
+       $(NULL)
+
 check_PROGRAMS = \
        NoSeekFileTest \
        URLTest \
@@ -45,23 +53,12 @@
        Range2dTest \
        $(NULL)
 
-if CURL
-check_PROGRAMS += CurlStreamTest
-endif
-
-CLEANFILES = \
-       testrun.sum \
-       testrun.log \
-       gnash-dbg.log \
-       site.exp.bak \
-       NoSeekFileTestCache \
-       Range2dTest \
-       Point2dTest \
-        snappingrangetest \
-       $(NULL)
-
-CurlStreamTest_SOURCES = CurlStreamTest.cpp
-CurlStreamTest_CPPFLAGS = '-DINPUT="$(srcdir)/CurlStreamTest.cpp"'
+#if CURL
+## This test needs an http server running to be useful
+#check_PROGRAMS += CurlStreamTest
+#CurlStreamTest_SOURCES = CurlStreamTest.cpp
+#CurlStreamTest_CPPFLAGS = '-DINPUT="$(srcdir)/CurlStreamTest.cpp"'
+#endif
 
 NoSeekFileTest_SOURCES = NoSeekFileTest.cpp
 NoSeekFileTest_CPPFLAGS = '-DINPUT="$(srcdir)/NoSeekFileTest.cpp"'