[Gnash-commit] gnash ChangeLog server/debugger.cpp server/pars...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/20 12:13:34

Modified files:
        .              : ChangeLog 
        server         : debugger.cpp 
        server/parser  : action_buffer.cpp 
        server/vm      : ActionExec.cpp 

Log message:
                * server/debugger.cpp, server/parser/action_buffer.cpp,
                  server/vm/ActionExec.cpp: don't force creation of the
                  SWFHandlers singleton too early, this hopefully means
                  at time of initialization the VM version will be known.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2952&r2=1.2953
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.27&r2=1.28

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2952
retrieving revision 1.2953
diff -u -b -r1.2952 -r1.2953
--- ChangeLog   20 Apr 2007 11:51:23 -0000      1.2952
+++ ChangeLog   20 Apr 2007 12:13:34 -0000      1.2953
@@ -1,5 +1,9 @@
 2007-04-20 Sandro Santilli <address@hidden>
 
+       * server/debugger.cpp, server/parser/action_buffer.cpp,
+         server/vm/ActionExec.cpp: don't force creation of the
+         SWFHandlers singleton too early, this hopefully means
+         at time of initialization the VM version will be known.
        * backend/render_handler.h: remove unused parameter warnings.
          [  I'm afraid this will confuse doxygen :(  ]
 

Index: server/debugger.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/debugger.cpp 16 Apr 2007 18:23:05 -0000      1.16
+++ server/debugger.cpp 20 Apr 2007 12:13:34 -0000      1.17
@@ -36,7 +36,6 @@
 namespace {
 gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
 gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
-const gnash::SWF::SWFHandlers& ash = gnash::SWF::SWFHandlers::instance();
 }
 
 using namespace std;
@@ -332,6 +331,8 @@
     unsigned char num[10];
     memset(num, 0, 10);
 
+    const gnash::SWF::SWFHandlers& ash = gnash::SWF::SWFHandlers::instance();
+
     if (_pc == 0) {
     }
     

Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/parser/action_buffer.cpp     18 Apr 2007 14:07:32 -0000      1.17
+++ server/parser/action_buffer.cpp     20 Apr 2007 12:13:34 -0000      1.18
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: action_buffer.cpp,v 1.17 2007/04/18 14:07:32 jgilmore Exp $ */
+/* $Id: action_buffer.cpp,v 1.18 2007/04/20 12:13:34 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -39,7 +39,6 @@
 
 namespace {
 gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
-const gnash::SWF::SWFHandlers& ash = gnash::SWF::SWFHandlers::instance();
 }
 
 namespace gnash {
@@ -192,6 +191,8 @@
 
     using namespace gnash::SWF;
 
+    const gnash::SWF::SWFHandlers& ash = gnash::SWF::SWFHandlers::instance();
+
     as_arg_t fmt = ARG_HEX;
     action_type        action_id = (action_type)instruction_data[0];
     unsigned char num[10];

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/vm/ActionExec.cpp    18 Apr 2007 14:07:33 -0000      1.27
+++ server/vm/ActionExec.cpp    20 Apr 2007 12:13:34 -0000      1.28
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ActionExec.cpp,v 1.27 2007/04/18 14:07:33 jgilmore Exp $ */
+/* $Id: ActionExec.cpp,v 1.28 2007/04/20 12:13:34 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -59,7 +59,6 @@
 
 namespace gnash {
 
-static const SWFHandlers& ash = SWFHandlers::instance();
 static LogFile& dbglogfile = LogFile::getDefaultInstance();
 #ifdef USE_DEBUGGER
 static Debugger& debugger = Debugger::getDefaultInstance();
@@ -127,6 +126,8 @@
     }
 #endif
                
+    static const SWFHandlers& ash = SWFHandlers::instance();
+               
     _original_target = env.get_target();
 
     _initial_stack_size = env.stack_size();