[Gnash-commit] gnash ChangeLog server/swf/DoInitActionTag.h

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/11/27 09:36:31

Modified files:
        .              : ChangeLog 
        server/swf     : DoInitActionTag.h 

Log message:
        revert the change, it might break the restart menu. "restart" won't 
parse the swf file again, so every definition tag should be immutable in theory.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4978&r2=1.4979
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/DoInitActionTag.h?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4978
retrieving revision 1.4979
diff -u -b -r1.4978 -r1.4979
--- ChangeLog   27 Nov 2007 09:28:59 -0000      1.4978
+++ ChangeLog   27 Nov 2007 09:36:31 -0000      1.4979
@@ -18,12 +18,6 @@
        * server/as_value.h: rename allowUnloaded parameter of sprite accessor
          methods to skipRebinding, for clarity.
 
-2007-11-27 Zou Lunkai <address@hidden>
-
-       * server/swf/DoInitActionTag.h: make sure DoInitAction tag executed only
-         once. Ready to drop sprite_instance::m_init_actions_executed. 
Executing
-         DoInitAction or not is independent on the life of associated sprites.
-       
 2007-11-26 Sandro Santilli <address@hidden>
 
        * server/asobj/NetStreamFfmpeg.{cpp,h}: more AVPacket wrapping work.

Index: server/swf/DoInitActionTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/DoInitActionTag.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/swf/DoInitActionTag.h        27 Nov 2007 05:34:23 -0000      1.2
+++ server/swf/DoInitActionTag.h        27 Nov 2007 09:36:31 -0000      1.3
@@ -30,7 +30,7 @@
 #include "swf.h" // for tag_type definition
 #include "action_buffer.h" // for composition
 #include "sprite_instance.h" // for inlines
-#include "ExecutableCode.h" // for GlobalCode
+//#include "tu_types.h" // for uint16_t, uint32_t etc. definition 
 
 // Forward declarations
 namespace gnash {
@@ -50,7 +50,6 @@
 public:
 
     DoInitActionTag()
-        :m_is_executed(false)
     {}
 
     /// Read a DoInitAction block from the stream
@@ -62,26 +61,12 @@
 
     virtual void execute_state(sprite_instance* m) const
     {
-        //m->execute_init_action_buffer(m_buf);
-        if(! m_is_executed)
-        {
-            m_is_executed = true;
-            std::auto_ptr<ExecutableCode> code ( new GlobalCode(m_buf, m) );
-            movie_root& root = VM::get().getRoot();
-            root.pushAction(code, movie_root::apINIT);
-        }
+        m->execute_init_action_buffer(m_buf);
     }
 
     virtual void execute(sprite_instance* m) const
     {
-        //m->execute_init_action_buffer(m_buf);
-        if(! m_is_executed)
-        {
-            m_is_executed = true;
-            std::auto_ptr<ExecutableCode> code ( new GlobalCode(m_buf, m) );
-            movie_root& root = VM::get().getRoot();
-            root.pushAction(code, movie_root::apINIT);
-        }
+        m->execute_init_action_buffer(m_buf);
     }
 
     // Tell the caller that we are an action tag.
@@ -107,7 +92,6 @@
 private:
 
     action_buffer m_buf;
-    mutable bool m_is_executed;
 };
 
 } // namespace gnash::SWF
@@ -121,3 +105,4 @@
 // mode: C++
 // indent-tabs-mode: t
 // End:
+