[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/03/29 07:36:17

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp sprite_instance.h 
        server/swf     : tag_loaders.cpp 

Log message:
                * server/sprite_instance.{h,cpp} add queueActions() method.
                * server/swf/tag_loaders.cpp: fix compiler warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2711&r2=1.2712
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.208&r2=1.209
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.81&r2=1.82

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2711
retrieving revision 1.2712
diff -u -b -r1.2711 -r1.2712
--- ChangeLog   29 Mar 2007 07:01:48 -0000      1.2711
+++ ChangeLog   29 Mar 2007 07:36:16 -0000      1.2712
@@ -1,5 +1,7 @@
 2007-03-29 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.{h,cpp} add queueActions() method.
+       * server/swf/tag_loaders.cpp: fix compiler warnings.
        * testsuite/server/Makefile.am: link in libgnashparser for the
          tests that turn out to need it since rob changed it from
          noinst_LTLIBRARY to lib_LTLIBRARY.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -b -r1.208 -r1.209
--- server/sprite_instance.cpp  28 Mar 2007 20:52:37 -0000      1.208
+++ server/sprite_instance.cpp  29 Mar 2007 07:36:16 -0000      1.209
@@ -2192,6 +2192,19 @@
 
 }
 
+/* private */
+void
+sprite_instance::queueActions(ActionList& actions)
+{
+       movie_root& root = VM::get().getRoot();
+       for(ActionList::iterator it=actions.begin(), itEnd=actions.end();
+                      it != itEnd; ++it)
+       {
+               action_buffer* buf = *it;
+               root.pushAction(*buf, 
boost::intrusive_ptr<sprite_instance>(this));
+       }
+}
+
 bool
 sprite_instance::on_event(const event_id& id)
 {

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- server/sprite_instance.h    28 Mar 2007 08:40:44 -0000      1.80
+++ server/sprite_instance.h    29 Mar 2007 07:36:17 -0000      1.81
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.80 2007/03/28 08:40:44 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.81 2007/03/29 07:36:17 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -694,6 +694,13 @@
        /// Queue event handler(s), if any.
        void queueEventHandler(const event_id& id);
 
+       /// Queue actions in the action list
+       //
+       /// The list of action will be pushed on the current
+       /// global list (see movie_root).
+       ///
+       void queueActions(ActionList& action_list);
+
        /// Set to yes when this instance has been unloaded
        bool _unloaded;
 

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- server/swf/tag_loaders.cpp  24 Mar 2007 14:34:08 -0000      1.81
+++ server/swf/tag_loaders.cpp  29 Mar 2007 07:36:17 -0000      1.82
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: tag_loaders.cpp,v 1.81 2007/03/24 14:34:08 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.82 2007/03/29 07:36:17 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -854,7 +854,7 @@
                        {
                                IF_VERBOSE_MALFORMED_SWF(
                                log_swferror("swf_event::read(), "
-                                       "even_length = %u, but only %u bytes 
left "
+                                       "even_length = %u, but only %lu bytes 
left "
                                        "to the end of current tag."
                                        " Breaking for safety.",
                                        event_length, 
in->get_tag_end_position()-in->get_position());