search for: swfdecmo

...ec_video_movie.c +++ b/libswfdec/swfdec_video_movie.c @@ -22,6 +22,7 @@ #endif #include "swfdec_video_movie.h" +#include "swfdec_player_internal.h" G_DEFINE_TYPE (SwfdecVideoMovie, swfdec_video_movie, SWFDEC_TYPE_MOVIE) @@ -95,6 +96,14 @@ swfdec_video_movie_iterate_end (SwfdecMo } static void +swfdec_video_movie_init_movie (SwfdecMovie *movie) +{ + SwfdecPlayer *player = SWFDEC_PLAYER (SWFDEC_AS_OBJECT (movie)->context); + + swfdec_as_object_set_constructor (SWFDEC_AS_OBJECT (movie), player->Video, FALSE); +} + +static void swfdec_video_movie_class_init (Swfde...

...00644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -875,7 +875,7 @@ swfdec_movie_get_variable (SwfdecAsObjec static void swfdec_movie_set_variable (SwfdecAsObject *object, const char *variable, - const SwfdecAsValue *val) + const SwfdecAsValue *val, guint flags) { SwfdecMovie *movie = SWFDEC_MOVIE (object); @@ -883,7 +883,7 @@ swfdec_movie_set_variable (SwfdecAsObjec return; if (swfdec_movie_set_asprop (movie, variable, val)) return; - SWFDEC_AS_OBJECT_CLASS (swfdec_movie_parent_class)->set (object, variable, val); + SWFDEC_AS_OBJECT_CLASS (swfdec...

...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 }, - { SWFDEC...

...7 +0200 don't crash if a DefineSprite has no ShowFrame tag diff --git a/libswfdec/swfdec_sprite_movie.c b/libswfdec/swfdec_sprite_movie.c index 319c878..3e25eb9 100644 --- a/libswfdec/swfdec_sprite_movie.c +++ b/libswfdec/swfdec_sprite_movie.c @@ -166,8 +166,8 @@ swfdec_sprite_movie_goto (SwfdecMovie *m g_assert (goto_frame < mov->n_frames); if (goto_frame >= movie->sprite->parse_frame) { - SWFDEC_WARNING ("jumping to not-yet-loaded frame %u (loaded: %u)", - goto_frame, movie->sprite->parse_frame); + SWFDEC_WARNING ("jumping to not-yet-loaded...

...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_s...

...make swfdec_movie_mouse_in() check children This makes kittencannon work diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index eb1e2e5..ca76cc5 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -480,11 +480,22 @@ gboolean swfdec_movie_mouse_in (SwfdecMovie *movie, double x, double y) { SwfdecMovieClass *klass; + GList *walk; klass = SWFDEC_MOVIE_GET_CLASS (movie); - if (klass->mouse_in == NULL) - return FALSE; - return klass->mouse_in (movie, x, y); + if (klass->mouse_in != NULL && + klass->mouse_in (movie,...

...lt;otte@gnome.org> Date: Wed Mar 7 21:07:15 2007 +0100 implement attachMovie diff --git a/libswfdec/swfdec_js_movie.c b/libswfdec/swfdec_js_movie.c index 2a860a4..3d04d92 100644 --- a/libswfdec/swfdec_js_movie.c +++ b/libswfdec/swfdec_js_movie.c @@ -382,6 +382,57 @@ swfdec_js_copy_props (SwfdecMovie *targe } static JSBool +swfdec_js_movie_attachMovie (JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + SwfdecMovie *movie, *ret; + const char *name, *export; + int depth; + SwfdecContent *content; + SwfdecGraphic *sprite; + + movie = JS_GetPrivate (cx, obj); + g...

...input->movie, surface, w, h); cairo_surface_destroy (surface); } diff --git a/libswfdec/swfdec_video_movie.c b/libswfdec/swfdec_video_movie.c index 49e1f4d..cf74a92 100644 --- a/libswfdec/swfdec_video_movie.c +++ b/libswfdec/swfdec_video_movie.c @@ -46,7 +46,9 @@ swfdec_video_movie_render (SwfdecMovie * if (movie->image == NULL) return; - cairo_scale (cr, SWFDEC_TWIPS_SCALE_FACTOR, SWFDEC_TWIPS_SCALE_FACTOR); + cairo_scale (cr, + (mov->original_extents.x1 - mov->original_extents.x0) / movie->image_width, + (mov->original_extents.y1 - mov->original_exte...

...0x80 /* internal, to avoid extra string */ diff --git a/libswfdec/swfdec_edittext_movie.c b/libswfdec/swfdec_edittext_movie.c index e3d2119..421f6bc 100644 --- a/libswfdec/swfdec_edittext_movie.c +++ b/libswfdec/swfdec_edittext_movie.c @@ -80,7 +80,7 @@ swfdec_edit_text_movie_iterate (SwfdecMo jsobj = swfdec_scriptable_get_object (parent); if (jsobj == NULL) return; - val = swfdec_js_eval (parent->jscx, jsobj, text->text->variable, FALSE); + val = swfdec_js_eval (parent->jscx, jsobj, text->text->variable); if (JSVAL_IS_VOID (val)) return; @@ -110,...

...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++; + dept...

...>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 +271...

...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,...

...0x80 /* internal, to avoid extra string */ diff --git a/libswfdec/swfdec_edittext_movie.c b/libswfdec/swfdec_edittext_movie.c index 421f6bc..e3d2119 100644 --- a/libswfdec/swfdec_edittext_movie.c +++ b/libswfdec/swfdec_edittext_movie.c @@ -80,7 +80,7 @@ swfdec_edit_text_movie_iterate (SwfdecMo jsobj = swfdec_scriptable_get_object (parent); if (jsobj == NULL) return; - val = swfdec_js_eval (parent->jscx, jsobj, text->text->variable); + val = swfdec_js_eval (parent->jscx, jsobj, text->text->variable, FALSE); if (JSVAL_IS_VOID (val)) return; @@ -110,...

...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); re...

...if (version > 5) { swfdec_as_object_add_function (proto, SWFDEC_AS_STR_addProperty, diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index 0ddb8ff..243dabc 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -377,7 +377,7 @@ swfdec_movie_run_construct (SwfdecMovie player = SWFDEC_PLAYER (SWFDEC_AS_OBJECT (movie)->context); g_queue_remove (player->construct_queue, movie); swfdec_movie_execute_script (movie, SWFDEC_EVENT_CONSTRUCT); - swfdec_as_object_call (SWFDEC_AS_OBJECT (movie), SWFDEC_AS_STR___constructor__, 0, NULL, NULL); + swfdec_a...

...diff --git a/libswfdec/swfdec_script.c b/libswfdec/swfdec_script.c index 39b3b8b..c416f64 100644 --- a/libswfdec/swfdec_script.c +++ b/libswfdec/swfdec_script.c @@ -267,6 +267,27 @@ swfdec_action_goto_label (JSContext *cx, return JS_TRUE; } +static int +swfdec_value_to_frame (JSContext *cx, SwfdecMovie *movie, jsval val) +{ + int frame; + + if (JSVAL_IS_STRING (val)) { + const char *name = swfdec_js_to_string (cx, val); + if (name == NULL || + !SWFDEC_IS_SPRITE_MOVIE (movie)) + return -1; + if (strchr (name, ':')) { + SWFDEC_ERROR ("FIXME: handle target...