[Gnash-commit] gnash ChangeLog testsuite/swfdec/PASSING utilit...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/14 22:59:09

Modified files:
        .              : ChangeLog 
        testsuite/swfdec: PASSING 
        utilities      : processor.cpp 

Log message:
                * utilities/processor.cpp: support fscommand:quit command.
                * testsuite/swfdec/PASSING: 39 successes found (used to fail 
just
                  because we didn't support the fscommand:quit command.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4607&r2=1.4608
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.65&r2=1.66

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4607
retrieving revision 1.4608
diff -u -b -r1.4607 -r1.4608
--- ChangeLog   14 Oct 2007 22:01:29 -0000      1.4607
+++ ChangeLog   14 Oct 2007 22:59:08 -0000      1.4608
@@ -1,5 +1,11 @@
 2007-10-14 Sandro Santilli <address@hidden>
 
+       * utilities/processor.cpp: support fscommand:quit command.
+       * testsuite/swfdec/PASSING: 39 successes found (used to fail just
+         because we didn't support the fscommand:quit command.
+
+2007-10-14 Sandro Santilli <address@hidden>
+
        * testsuite/check.h: force literal string to std::string conversion in
          check_equals and xcheck_equals (fixes compiler warnings from gcc >=
          4.1.x)

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- testsuite/swfdec/PASSING    6 Oct 2007 09:06:28 -0000       1.38
+++ testsuite/swfdec/PASSING    14 Oct 2007 22:59:09 -0000      1.39
@@ -271,3 +271,42 @@
 export-case-5.swf
 export-case-6.swf
 export-case-7.swf
+place-object-remove-5.swf
+place-object-remove-6.swf
+place-object-remove-7.swf
+place-object-remove-button-move-5.swf
+place-object-remove-button-move-6.swf
+place-object-remove-button-move-7.swf
+place-object-remove-button-move-name-5.swf
+place-object-remove-button-move-name-6.swf
+place-object-remove-button-move-name-7.swf
+place-object-remove-char-move-5.swf
+place-object-remove-char-move-6.swf
+place-object-remove-char-move-7.swf
+place-object-remove-char-move-name-5.swf
+place-object-remove-char-move-name-6.swf
+place-object-remove-char-move-name-7.swf
+place-object-remove-move-5.swf
+place-object-remove-move-6.swf
+place-object-remove-move-7.swf
+place-object-remove-move-name-5.swf
+place-object-remove-move-name-6.swf
+place-object-remove-move-name-7.swf
+place-object-remove-movie-5.swf
+place-object-remove-movie-6.swf
+place-object-remove-movie-7.swf
+place-object-remove-movie-move-5.swf
+place-object-remove-movie-move-6.swf
+place-object-remove-movie-move-7.swf
+place-object-remove-movie-move-name-5.swf
+place-object-remove-movie-move-name-6.swf
+place-object-remove-movie-move-name-7.swf
+place-object-remove-movie-name-5.swf
+place-object-remove-movie-name-6.swf
+place-object-remove-movie-name-7.swf
+place-object-remove-name-5.swf
+place-object-remove-name-6.swf
+place-object-remove-name-7.swf
+rewind-remove-5.swf
+setvariable-callback-6.swf
+setvariable-callback-7.swf

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- utilities/processor.cpp     13 Sep 2007 09:47:32 -0000      1.65
+++ utilities/processor.cpp     14 Oct 2007 22:59:09 -0000      1.66
@@ -133,6 +133,18 @@
        return ( now - lastAdvanceTimer);
 }
 
+// A flag which will be used to interrupt playback
+// by effect of a "quit" fscommand
+//
+static int quitrequested = false;
+
+void execFsCommand(sprite_instance* movie, const char* command, const char* 
args)
+{
+    log_msg(_("fs_callback(%p): %s %s"), (void*)movie, command, args);
+
+    if ( ! strcasecmp(command, "quit") ) quitrequested=true;
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -262,6 +274,8 @@
        exit(1);
     }
 
+    register_fscommand_callback(execFsCommand);
+
     // Play through all the movies.
     for (int i = 0, n = infiles.size(); i < n; i++) {
 
@@ -358,6 +372,13 @@
        
        size_t  last_frame = m.get_current_frame();
        m.advance(0.010f);
+
+    if ( quitrequested ) 
+    {
+        quitrequested = false;
+        return md;
+    }
+
        m.display();
        ++nadvances;
        if ( limit_advances && nadvances >= limit_advances)