[Swfdec] Branch 'as' - 2 commits - libswfdec/swfdec_sprite.c test/trace

[Benjamin Otte]

 libswfdec/swfdec_sprite.c |    2 +-
 test/trace/trace.c        |   15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

New commits:
diff-tree 325531065c64b6b31202f2f3b0746cb5f8d501ea (from a28bd0320a3af095152f11883e3af38152208d27)
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Jun 13 18:19:18 2007 +0200

    simplify code

diff --git a/test/trace/trace.c b/test/trace/trace.c
index 990e7cb..55f8e98 100644
--- a/test/trace/trace.c
+++ b/test/trace/trace.c
@@ -17,7 +17,7 @@ run_test (const char *filename)
   SwfdecLoader *loader;
   SwfdecPlayer *player;
   SwfdecBuffer *buffer;
-  guint time_left;
+  guint advance;
   char *str;
   GString *string;
   GError *error = NULL;
@@ -38,17 +38,8 @@ run_test (const char *filename)
     return FALSE;
   }
 
-  time_left = ceil (10000 / swfdec_player_get_rate (player));
-  /* FIXME: Make the number of iterations configurable? */
-  while (TRUE) {
-    /* FIXME: will not do 10 iterations if there's other stuff loaded */
-    guint advance = swfdec_player_get_next_event (player);
-
-    if (advance > time_left)
-      break;
-    swfdec_player_advance (player, advance);
-    time_left -= advance;
-  }
+  advance = ceil (10000 / swfdec_player_get_rate (player));
+  swfdec_player_advance (player, advance);
   g_signal_handlers_disconnect_by_func (player, trace_cb, string);
   g_object_unref (player);
 
diff-tree a28bd0320a3af095152f11883e3af38152208d27 (from 4aec39b9f9a750efe75864a54b035ed872ab6644)
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Jun 13 18:19:08 2007 +0200

    init and construct event are implemented, don't warn about them anymore

diff --git a/libswfdec/swfdec_sprite.c b/libswfdec/swfdec_sprite.c
index eaee0db..de4c741 100644
--- a/libswfdec/swfdec_sprite.c
+++ b/libswfdec/swfdec_sprite.c
@@ -369,7 +369,7 @@ swfdec_spriteseg_do_place_object (Swfdec
 
       SWFDEC_INFO ("clip event with flags 0x%X, key code %d", event_flags, key_code);
 #define SWFDEC_IMPLEMENTED_EVENTS \
-  (SWFDEC_EVENT_LOAD | SWFDEC_EVENT_UNLOAD | SWFDEC_EVENT_ENTER | \
+  (SWFDEC_EVENT_LOAD | SWFDEC_EVENT_UNLOAD | SWFDEC_EVENT_ENTER | SWFDEC_EVENT_INITIALIZE | SWFDEC_EVENT_CONSTRUCT | \
    SWFDEC_EVENT_MOUSE_DOWN | SWFDEC_EVENT_MOUSE_MOVE | SWFDEC_EVENT_MOUSE_UP)
       if (event_flags & ~SWFDEC_IMPLEMENTED_EVENTS) {
 	SWFDEC_ERROR ("using non-implemented clip events %u", event_flags & ~SWFDEC_IMPLEMENTED_EVENTS);