[Gnash-commit] gnash ChangeLog server/swf/ASHandlers.cpp serve...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/06/30 00:15:45

Modified files:
        .              : ChangeLog 
        server/swf     : ASHandlers.cpp ASHandlers.h 

Log message:
        static SWFHandlers's action handlers made private in SWFHandlers class; 
added an SWFHandlers::action_name(action_type) utility method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.443&r2=1.444
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.h?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -b -r1.443 -r1.444
--- ChangeLog   30 Jun 2006 00:12:54 -0000      1.443
+++ ChangeLog   30 Jun 2006 00:15:44 -0000      1.444
@@ -1,5 +1,8 @@
 2006-06-30 Sandro Santilli <address@hidden>
 
+       * server/swf/ASHandlers.cpp, server/swf/ASHandlers.h:
+       static action handlers made private in SWFHandlers class;
+       added an SWFHandlers::action_name(action_type) utility method.
        * server/as_environment.h (dump_stack): display stack contents
        on a single line, to enhance readibility of stack changes.
        * server/action.cpp: removed useless ASHandlers.h include.

Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/swf/ASHandlers.cpp   29 Jun 2006 19:19:13 -0000      1.19
+++ server/swf/ASHandlers.cpp   30 Jun 2006 00:15:44 -0000      1.20
@@ -2431,6 +2431,21 @@
                  
 }
 
+const char*
+SWFHandlers::action_name(action_type x) const
+{
+       return "CIPPA";
+       if ( x > _handlers.size() )
+       {
+               log_error("at SWFHandlers::action_name(%d) call time, _handlers 
size is %d", x, _handlers.size());
+               return NULL;
+       }
+       else
+       {
+               return _handlers[x].getName().c_str();
+       }
+}
+
 } // namespace gnash::SWF
 
 } // namespace gnash

Index: server/swf/ASHandlers.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/swf/ASHandlers.h     25 Jun 2006 16:53:04 -0000      1.2
+++ server/swf/ASHandlers.h     30 Jun 2006 00:15:45 -0000      1.3
@@ -122,6 +122,24 @@
 
        void toggleDebug(bool state) { _debug = state; }
 
+       size_t size() const { return _handlers.size(); }
+
+       action_type lastType() const
+       {
+               return ACTION_GOTOEXPRESSION;
+               //return _handlers[ACTION_GOTOEXPRESSION].getType();
+       }
+
+       const ActionHandler &operator[] (action_type x) const
+       {
+               //return const_cast<ActionHandler>(_handlers[x]);
+               return _handlers[x];
+       }
+
+       const char* action_name(action_type x) const;
+
+private:
+
        static void ActionEnd(ActionExec& thread);
        static void ActionNextFrame(ActionExec& thread);
        static void ActionPrevFrame(ActionExec& thread);
@@ -223,22 +241,6 @@
        static void ActionDefineFunction(ActionExec& thread);
        static void ActionSetRegister(ActionExec& thread);
 
-       size_t size() const { return _handlers.size(); }
-
-       action_type lastType() const
-       {
-               return ACTION_GOTOEXPRESSION;
-               //return _handlers[ACTION_GOTOEXPRESSION].getType();
-       }
-
-       const ActionHandler &operator[] (action_type x) const
-       {
-               //return const_cast<ActionHandler>(_handlers[x]);
-               return _handlers[x];
-       }
-
-private:
-
        bool _debug;
 
        static container_type _handlers;