search for: swfdecm

...00 add a crude hack so MovieClip-only properties only exist on movielcips diff --git a/libswfdec/swfdec_movie_asprops.c b/libswfdec/swfdec_movie_asprops.c index e9fef7d..cf9102e 100644 --- a/libswfdec/swfdec_movie_asprops.c +++ b/libswfdec/swfdec_movie_asprops.c @@ -347,34 +347,35 @@ mc_root (SwfdecMovie *movie, SwfdecAsVal } struct { + gboolean needs_movie; const char *name; void (* get) (SwfdecMovie *movie, SwfdecAsValue *ret); void (* set) (SwfdecMovie *movie, const SwfdecAsValue *val); } swfdec_movieclip_props[] = { - { SWFDEC_AS_STR__x, mc_x_get, mc_x_set }, - { SWFDE...

...2007 +0100 mark properties from attached movies DontDelete and ReadOnly diff --git a/libswfdec/swfdec_js_movie.c b/libswfdec/swfdec_js_movie.c index 61baaee..dcf119d 100644 --- a/libswfdec/swfdec_js_movie.c +++ b/libswfdec/swfdec_js_movie.c @@ -1124,6 +1124,7 @@ swfdec_js_movie_add_property (SwfdecMovi jsval val; JSObject *jsobj; JSContext *cx; + JSBool found = JS_FALSE; jsobj = swfdec_scriptable_get_object (script); val = OBJECT_TO_JSVAL (jsobj); @@ -1138,7 +1139,11 @@ swfdec_js_movie_add_property (SwfdecMovi jsobj = SWFDEC_ROOT_MOVIE (movie)->player->jsobj;...

...gnome.org> Date: Mon Jun 18 23:43:19 2007 +0200 only trigger events for sprite movies diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index a1c9be6..f5019c3 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -257,7 +257,10 @@ swfdec_movie_do_remove (SwfdecMovie *mov if (movie->parent) movie->parent->list = g_list_sort (movie->parent->list, swfdec_movie_compare_depths); - return !swfdec_movie_queue_script (movie, SWFDEC_EVENT_UNLOAD); + if (SWFDEC_IS_SPRITE_MOVIE (movie)) + return !swfdec_movie_queue_script (movie, SWFDEC_...

...org> Date: Thu Jun 14 13:42:07 2007 +0200 only copy x0 and y0 on unmodified movies diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index 0a0056c..be3e877 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -138,7 +138,15 @@ swfdec_movie_update_matrix (SwfdecMovie { double d, e; - movie->matrix = movie->original_transform; + /* we operate on x0 and y0 when setting movie._x and movie._y */ + if (movie->modified) { + movie->matrix.xx = movie->original_transform.xx; + movie->matrix.yx = movie->original_transform.yx; +...

...movieclip (JSContext * cx, + JSObject * object); G_END_DECLS diff --git a/libswfdec/swfdec_js_movie.c b/libswfdec/swfdec_js_movie.c index 855d002..1c4d80a 100644 --- a/libswfdec/swfdec_js_movie.c +++ b/libswfdec/swfdec_js_movie.c @@ -1175,3 +1175,11 @@ swfdec_js_movie_remove_property (SwfdecM } } +gboolean +swfdec_js_is_movieclip (JSContext *cx, JSObject *object) +{ + g_return_val_if_fail (cx != NULL, FALSE); + g_return_val_if_fail (object != NULL, FALSE); + + return JS_InstanceOf (cx, object, &movieclip_class, NULL); +} diff-tree 1041f2ee1c6c96ab61e766e968ebb16b2d11cfc7 (f...

...unsigned int conditions, guint8 key); diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index a1df353..0e7715c 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -339,8 +339,14 @@ swfdec_movie_execute_script (gpointer mo SwfdecMovie *movie = moviep; guint condition = GPOINTER_TO_UINT (data); - g_assert (movie->content->events); - swfdec_event_list_execute (movie->content->events, SWFDEC_SCRIPTABLE (movie), condition, 0); + if (movie->content->events) { + swfdec_event_list_execute (movie->con...

...,6 +26,7 @@ #include <math.h> #include <js/jsapi.h> +#include <js/jsinterp.h> /* for JS_IntetrnalCall */ #include "swfdec_js.h" #include "swfdec_movie.h" #include "swfdec_bits.h" @@ -605,11 +606,13 @@ swfdec_js_movie_to_string (JSContext *cx SwfdecMovie *movie; movie = JS_GetPrivate (cx, obj); - g_assert (movie); - - s = swfdec_movie_get_path (movie); - string = JS_NewStringCopyZ (cx, s); - g_free (s); + if (movie) { + s = swfdec_movie_get_path (movie); + string = JS_NewStringCopyZ (cx, s); + g_free (s); + } else { + str...

...y_name (SwfdecPlayer * } static gboolean -swfdec_movie_get_variable (SwfdecAsObject *object, const char *variable, - SwfdecAsValue *val, guint *flags) +swfdec_movie_get_variable (SwfdecAsObject *object, SwfdecAsObject *orig, + const char *variable, SwfdecAsValue *val, guint *flags) { SwfdecMovie *movie = SWFDEC_MOVIE (object); if (movie->state == SWFDEC_MOVIE_STATE_DESTROYED) return FALSE; - if (SWFDEC_AS_OBJECT_CLASS (swfdec_movie_parent_class)->get (object, variable, val, flags)) + if (SWFDEC_AS_OBJECT_CLASS (swfdec_movie_parent_class)->get (object, orig, varia...

...o SwfdecSpriteInfo; +struct _SwfdecSpriteInfo { + gboolean init_action_has_run; /* TRUE if init actions have been run */ +}; + +static void +swfdec_sprite_info_free (gpointer infop) +{ + SwfdecSpriteInfo *info = infop; + + g_free (info); +} + +static SwfdecSpriteInfo * +swfdec_sprite_info_get (SwfdecMovie *movie, SwfdecSprite *sprite) +{ + SwfdecRootMovie *root = SWFDEC_ROOT_MOVIE (movie->root); + SwfdecSpriteInfo *info; + + info = swfdec_root_movie_get_character_data (root, SWFDEC_CHARACTER (sprite)); + if (info == NULL) { + info = g_new0 (SwfdecSpriteInfo, 1); + swfdec_root_movie_...

...->mouse_in = mouse_in; movie->mouse_button = button; diff --git a/libswfdec/swfdec_sprite_movie.c b/libswfdec/swfdec_sprite_movie.c index f303f33..2ca5877 100644 --- a/libswfdec/swfdec_sprite_movie.c +++ b/libswfdec/swfdec_sprite_movie.c @@ -264,7 +264,8 @@ swfdec_sprite_movie_iterate_end (SwfdecM if (movie->sound_frame != movie->current_frame) { for (walk = current->sound; walk; walk = walk->next) { SwfdecAudio *audio = swfdec_audio_event_new (player, walk->data); - g_object_unref (audio); + if (audio) + g_object_unref (audio); } } diff-tree...

...is_eof (SwfdecFlvDecoder *flv) +{ + g_return_val_if_fail (SWFDEC_IS_FLV_DECODER (flv), TRUE); + + return flv->state == SWFDEC_STATE_EOF; +} + +void +swfdec_flv_decoder_eof (SwfdecFlvDecoder *flv) +{ + g_return_if_fail (SWFDEC_IS_FLV_DECODER (flv)); + + flv->state = SWFDEC_STATE_EOF; +} + SwfdecMovie * swfdec_flv_decoder_add_movie (SwfdecFlvDecoder *flv, SwfdecMovie *parent) { @@ -511,10 +550,8 @@ swfdec_flv_decoder_add_movie (SwfdecFlvD /* set up the playback stream */ conn = swfdec_connection_new (SWFDEC_ROOT_MOVIE (parent)->player->jscx); stream = swfdec_net_stream_new (...

...7df703fa4 Author: Benjamin Otte <otte at gnome.org> Date: Wed Jun 13 15:38:50 2007 +0200 Merge branch 'as' of ssh://company at git.freedesktop.org/git/swfdec into as diff --cc libswfdec/swfdec_sprite_movie_as.c index cf35c13,c5a3c4c..c2e9a42 @@@ -281,12 -298,13 +295,12 @@@ SwfdecMovie *ret; const char *name, *export; int depth; - SwfdecContent *content; SwfdecGraphic *sprite; - export = swfdec_as_value_to_string (obj->context, &argv[0]); - name = swfdec_as_value_to_string (obj->context, &argv[1]); + export = swfdec_as_value_to_string (cx,...

...break; + } + g_assert_not_reached (); + return G_TYPE_NONE; +} + +static gboolean +swfdec_debug_movies_get_iter (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreePath *path) +{ + SwfdecDebugMovies *movies = SWFDEC_DEBUG_MOVIES (tree_model); + guint depth; + int *indices; + GList *walk; + SwfdecMovie *movie; + + REPORT; + depth = gtk_tree_path_get_depth (path); + indices = gtk_tree_path_get_indices (path); + if (indices == NULL) + return FALSE; + walk = g_list_nth (movies->player->roots, *indices); + if (!walk) + return FALSE; + movie = walk->data; + indices++; + dep...

...>context), movie->button->sounds[sound]); if (audio) g_object_unref (audio); diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index a173c3c..6051b01 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -78,7 +78,7 @@ swfdec_movie_invalidate (SwfdecMovie *mo return; swfdec_rect_transform (&rect, &rect, &movie->matrix); } - swfdec_player_invalidate (SWFDEC_ROOT_MOVIE (movie)->player, &rect); + swfdec_player_invalidate (SWFDEC_PLAYER (SWFDEC_AS_OBJECT (movie)->context), &rect); } /** @@ -271,8 +27...

...->mouse_in = mouse_in; movie->mouse_button = button; diff --git a/libswfdec/swfdec_sprite_movie.c b/libswfdec/swfdec_sprite_movie.c index f303f33..2ca5877 100644 --- a/libswfdec/swfdec_sprite_movie.c +++ b/libswfdec/swfdec_sprite_movie.c @@ -264,7 +264,8 @@ swfdec_sprite_movie_iterate_end (SwfdecM if (movie->sound_frame != movie->current_frame) { for (walk = current->sound; walk; walk = walk->next) { SwfdecAudio *audio = swfdec_audio_event_new (player, walk->data); - g_object_unref (audio); + if (audio) + g_object_unref (audio); } } diff-tree...

...y_name (SwfdecPlayer * } static gboolean -swfdec_movie_get_variable (SwfdecAsObject *object, const char *variable, - SwfdecAsValue *val, guint *flags) +swfdec_movie_get_variable (SwfdecAsObject *object, SwfdecAsObject *orig, + const char *variable, SwfdecAsValue *val, guint *flags) { SwfdecMovie *movie = SWFDEC_MOVIE (object); if (movie->state == SWFDEC_MOVIE_STATE_DESTROYED) return FALSE; - if (SWFDEC_AS_OBJECT_CLASS (swfdec_movie_parent_class)->get (object, variable, val, flags)) + if (SWFDEC_AS_OBJECT_CLASS (swfdec_movie_parent_class)->get (object, orig, varia...

...lizing happens after queuein the onLoad script see onload-childparent.swf test diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index 98d0619..0ae840f 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -1007,12 +1007,12 @@ swfdec_movie_new_for_content (SwfdecMovi swfdec_movie_set_static_properties (movie, content->has_transform ? &content->transform : NULL, content->has_color_transform ? &content->color_transform : NULL, content->ratio, content->clip_depth, content->events); - swfdec_movie_initialize (movie...

...3,7 +23,6 @@ #include "config.h" #endif #include <string.h> -#include <js/jsapi.h> #include "swfdec_button.h" #include "swfdec_button_movie.h" #include "swfdec_sound.h" @@ -60,11 +59,12 @@ swfdec_button_dispose (GObject *object) } static SwfdecMovie * -swfdec_button_create_movie (SwfdecGraphic *graphic) +swfdec_button_create_movie (SwfdecGraphic *graphic, gsize *size) { SwfdecButtonMovie *movie = g_object_new (SWFDEC_TYPE_BUTTON_MOVIE, NULL); movie->button = SWFDEC_BUTTON (graphic); + *size = sizeof (SwfdecButtonMovie); r...