[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv... |
|
Date: |
Thu, 29 Mar 2007 08:58:59 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/03/29 08:58:59
Modified files:
. : ChangeLog
server : sprite_instance.cpp sprite_instance.h
testsuite/misc-ming.all: consecutive_goto_frame_test.c
testsuite/swfdec: PASSING
Log message:
* server/sprite_instance.{h,cpp} (goto_frame): push target
actions to the global list; (unload): set the _unloaded
flag; (m_goto_action_list): deprecated !
* testsuite/misc-ming.all/consecutive_goto_frame_test.c:
don't expect a failure.
* testsuite/swfdec/PASSING: goto2.swf succeeds.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2713&r2=1.2714
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.209&r2=1.210
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/consecutive_goto_frame_test.c?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.12&r2=1.13
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2713
retrieving revision 1.2714
diff -u -b -r1.2713 -r1.2714
--- ChangeLog 29 Mar 2007 08:44:05 -0000 1.2713
+++ ChangeLog 29 Mar 2007 08:58:58 -0000 1.2714
@@ -1,5 +1,14 @@
2007-03-29 Sandro Santilli <address@hidden>
+ * server/sprite_instance.{h,cpp} (goto_frame): push target
+ actions to the global list; (unload): set the _unloaded
+ flag; (m_goto_action_list): deprecated !
+ * testsuite/misc-ming.all/consecutive_goto_frame_test.c:
+ don't expect a failure.
+ * testsuite/swfdec/PASSING: goto2.swf succeeds.
+
+2007-03-29 Sandro Santilli <address@hidden>
+
* server/asobj/string.cpp (string_split): fix compiler wanring
and handle SWF5 case.
* testsuite/actionscript.all/String.as: expect less failures.
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -b -r1.209 -r1.210
--- server/sprite_instance.cpp 29 Mar 2007 07:36:16 -0000 1.209
+++ server/sprite_instance.cpp 29 Mar 2007 08:58:58 -0000 1.210
@@ -1568,7 +1568,7 @@
_drawable(new DynamicShape),
_drawable_inst(_drawable->create_character_instance(this, 0)),
m_action_list(),
- m_goto_frame_action_list(),
+ //m_goto_frame_action_list(),
m_play_state(PLAY),
m_current_frame(0),
m_has_looped(false),
@@ -2721,6 +2721,7 @@
//log_msg("Advancing %d newly-added (after clearing) childs of %s",
newlyAdded.size(), getTargetPath().c_str());
newlyAdded.advance(delta_time);
+#if 0 // we push gotoframe actions on the global queue now
// goto_frame_action (for now) need be executed
// *after* actions in child sprites have
// been executed. When action execution order
@@ -2738,6 +2739,7 @@
execute_actions(m_goto_frame_action_list);
assert(m_goto_frame_action_list.empty());
}
+#endif
// Remember current state of the DisplayList for next iteration
oldDisplayList = m_display_list;
@@ -3054,7 +3056,8 @@
// become obsoleted and the target frame actions could be pushed
// directly on the preexisting m_action_list (and no need to back it
up).
//
- m_goto_frame_action_list = m_action_list;
+ //m_goto_frame_action_list = m_action_list;
+ queueActions(m_action_list);
// Restore ActionList from backup
m_action_list = actionListBackup;
@@ -3788,6 +3791,7 @@
UnloaderVisitor visitor;
m_display_list.visitForward(visitor);
on_event(event_id::UNLOAD); // if call_unload
+ _unloaded=true;
}
Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- server/sprite_instance.h 29 Mar 2007 07:36:17 -0000 1.81
+++ server/sprite_instance.h 29 Mar 2007 08:58:58 -0000 1.82
@@ -17,7 +17,7 @@
//
//
-/* $Id: sprite_instance.h,v 1.81 2007/03/29 07:36:17 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.82 2007/03/29 08:58:58 strk Exp $ */
// Stateful live Sprite instance
@@ -748,7 +748,10 @@
boost::intrusive_ptr<character> _drawable_inst;
ActionList m_action_list;
- ActionList m_goto_frame_action_list;
+
+ // this is deprecated, we'll be pushing gotoframe target
+ // actions to the global action queue
+ //ActionList m_goto_frame_action_list;
play_state m_play_state;
Index: testsuite/misc-ming.all/consecutive_goto_frame_test.c
===================================================================
RCS file:
/sources/gnash/gnash/testsuite/misc-ming.all/consecutive_goto_frame_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-ming.all/consecutive_goto_frame_test.c 16 Feb 2007
23:24:34 -0000 1.4
+++ testsuite/misc-ming.all/consecutive_goto_frame_test.c 29 Mar 2007
08:58:59 -0000 1.5
@@ -97,21 +97,21 @@
SWFMovie_nextFrame(mo); /* 2nd frame */
/* mc_red.x has been set after playing the 1st frame, check it here */
- add_actions(mo, " xcheck_equals(mc_red.x, 'as_in_frm1_of_mc_red'); "
+ add_actions(mo, " check_equals(mc_red.x, 'as_in_frm1_of_mc_red'); "
" _root.note('frm3 of root - gotoAndStop(4)');"
"mc_red.x = 'as_in_frm3_of_root'; "
"gotoAndStop(4); ");
SWFMovie_nextFrame(mo); /* 3rd frame */
/* mc_red.x has been set again after playing the 2nd frame, check it again */
- add_actions(mo, " xcheck_equals(mc_red.x, 'as_in_frm2_of_mc_red'); "
+ add_actions(mo, " check_equals(mc_red.x, 'as_in_frm2_of_mc_red'); "
" _root.note('frm4 of root - gotoAndStop(5)');"
" mc_red.x = \"as_in_frm4_of_root\"; "
" gotoAndStop(5); ");
SWFMovie_nextFrame(mo); /* 4th frame */
/* mc_red.x has been set again after playing the 3rd frame, check it again */
- xcheck_equals(mo, "mc_red.x", "'as_in_frm3_of_mc_red'");
+ check_equals(mo, "mc_red.x", "'as_in_frm3_of_mc_red'");
add_actions(mo, " _root.totals(); stop(); ");
SWFMovie_nextFrame(mo); /* 5th frame */
Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/swfdec/PASSING 22 Mar 2007 17:46:02 -0000 1.12
+++ testsuite/swfdec/PASSING 29 Mar 2007 08:58:59 -0000 1.13
@@ -11,6 +11,7 @@
undefined1.swf
undefined2-6.swf
goto1.swf
+goto2.swf
goto3.swf
goto4.swf
goto5.swf