search for: swfdec_movie_dupl

So here is the patch series to make blocky.swf work with branch 'as'. Summary: Nguy?n Th?i Ng?c Duy (7): Add a missing else statement Create swfdec_movie_duplicate Implement action CloneSprite with swfdec_movie_duplicate Add action RemoveSprite Add new variables to the target Remove movies with the same name when adding new movie We don't handle replacing movies other than SwfdecGraphicMovie yet libswfdec/swfdec_as_con...

...ue the same events for CloneSprite diff --git a/libswfdec/swfdec_as_interpret.c b/libswfdec/swfdec_as_interpret.c index ae14f4f..938165e 100644 --- a/libswfdec/swfdec_as_interpret.c +++ b/libswfdec/swfdec_as_interpret.c @@ -2113,6 +2113,11 @@ swfdec_action_clone_sprite (SwfdecAsCont new_movie = swfdec_movie_duplicate (movie, new_name, depth); if (new_movie) { SWFDEC_LOG ("duplicated %s as %s to depth %u", movie->name, new_movie->name, new_movie->depth); + if (SWFDEC_IS_SPRITE_MOVIE (new_movie)) { + g_queue_push_tail (SWFDEC_PLAYER (cx)->init_queue, new_movie); + s...

libswfdec/swfdec_as_interpret.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) New commits: diff-tree 38fbc1389267e593b44041018cbb1750bdcce0fb (from aaca94203d8a0ccb8feb32c0d57df3401fca0350) Author: Benjamin Otte <otte at gnome.org> Date: Sun Jun 17 14:19:45 2007 +0200 actually convert the values to a string when comparing strings diff --git

...r); + swfdec_player_unroot_object (player, G_OBJECT (resource)); + return FALSE; + } + movie = swfdec_player_get_movie_at_level (player, level); + } + if (movie == NULL) { + movie = swfdec_player_create_movie_at_level (player, resource, level); + } else { + /* can't use swfdec_movie_duplicate() here, we copy to same depth */ + SwfdecMovie *mov = SWFDEC_MOVIE (movie); + SwfdecMovie *copy; + + copy = swfdec_movie_new (SWFDEC_PLAYER (SWFDEC_AS_OBJECT (movie)->context), + mov->depth, mov->parent, resource, NULL, mov->name); + if (copy == NULL) + return...

...variable); if (movie) { SWFDEC_AS_VALUE_SET_OBJECT (val, SWFDEC_AS_OBJECT (movie)); *flags = 0; diff --git a/libswfdec/swfdec_movie.h b/libswfdec/swfdec_movie.h index d383c98..dce5e2c 100644 --- a/libswfdec/swfdec_movie.h +++ b/libswfdec/swfdec_movie.h @@ -174,6 +174,8 @@ SwfdecMovie * swfdec_movie_duplicate (S void swfdec_movie_initialize (SwfdecMovie * movie); SwfdecMovie * swfdec_movie_find (SwfdecMovie * movie, int depth); +SwfdecMovie * swfdec_movie_get_by_name (SwfdecMovie * movie, + const char * name); void swfdec_movie_remove (SwfdecMovie * movie); void swfd...

...-git a/libswfdec/swfdec_as_interpret.c b/libswfdec/swfdec_as_interpret.c index 823e161..99a1215 100644 --- a/libswfdec/swfdec_as_interpret.c +++ b/libswfdec/swfdec_as_interpret.c @@ -2467,12 +2467,6 @@ swfdec_action_clone_sprite (SwfdecAsContext *cx, guint action, const guint8 *dat new_movie = swfdec_movie_duplicate (movie, new_name, depth); if (new_movie) { SWFDEC_LOG ("duplicated %s as %s to depth %u", movie->name, new_movie->name, new_movie->depth); - if (SWFDEC_IS_SPRITE_MOVIE (new_movie)) { - g_queue_push_tail (SWFDEC_PLAYER (cx)->init_queue, new_movie); - swfde...

...wfdec_resource_emit_error (SwfdecResource *resource, const char *message) swfdec_resource_emit_signal (resource, SWFDEC_AS_STR_onLoadError, FALSE, vals, 2); } +static SwfdecSpriteMovie * +swfdec_resource_replace_movie (SwfdecSpriteMovie *movie, SwfdecResource *resource) +{ + /* can't use swfdec_movie_duplicate() here, we copy to same depth */ + SwfdecMovie *mov = SWFDEC_MOVIE (movie); + SwfdecMovie *copy; + + copy = swfdec_movie_new (SWFDEC_PLAYER (SWFDEC_AS_OBJECT (movie)->context), + mov->depth, mov->parent, resource, NULL, mov->name); + if (copy == NULL) + return FALSE;...

...ate (movie->parent ? movie->parent : movie); } + if (blend_mode != movie->blend_mode) { + movie->blend_mode = blend_mode; + swfdec_movie_invalidate (movie); + } if (events) { if (movie->events) swfdec_event_list_free (movie->events); @@ -1172,7 +1177,8 @@ swfdec_movie_duplicate (SwfdecMovie *mov if (copy == NULL) return NULL; swfdec_movie_set_static_properties (copy, &movie->original_transform, - &movie->original_ctrans, movie->original_ratio, movie->clip_depth, movie->events); + &movie->original_ctrans, movie->or...

...d Nov 28 09:47:30 2007 +0100 get rid of SwfdecContent Weeeeeee.... I was so hoping to get rid of it. diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index d1c0296..33717b0 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -1604,34 +1604,6 @@ swfdec_movie_duplicate (SwfdecMovie *movie, const char *name, int depth) return copy; } -SwfdecMovie * -swfdec_movie_new_for_content (SwfdecMovie *parent, const SwfdecContent *content) -{ - SwfdecPlayer *player; - SwfdecMovie *movie; - - g_return_val_if_fail (SWFDEC_IS_MOVIE (parent), NULL); - g_return_val...

...size); + /* only setup here, the resource assumes it can access the player via the movie */ + if (resource->movie == NULL) { + g_assert (SWFDEC_IS_SPRITE_MOVIE (movie)); + swfdec_resource_set_movie (resource, SWFDEC_SPRITE_MOVIE (movie)); + } return movie; } @@ -1372,7 +1380,7 @@ swfdec_movie_duplicate (SwfdecMovie *movie, const char *name, int depth) swfdec_movie_remove (copy); } copy = swfdec_movie_new (SWFDEC_PLAYER (SWFDEC_AS_OBJECT (movie)->context), depth, - parent, movie->graphic, name); + parent, movie->resource, movie->graphic, name); if (copy ==...

...mov = SWFDEC_MOVIE (movie); - g_object_unref (resource); } else { - mov = SWFDEC_MOVIE (movie); - swfdec_sprite_movie_unload (movie); - g_object_unref (mov->resource); - mov->resource = resource; - swfdec_resource_set_movie (mov->resource, movie); + /* can't use swfdec_movie_duplicate() here, we copy to same depth */ + SwfdecMovie *mov = SWFDEC_MOVIE (movie); + SwfdecMovie *copy; + + copy = swfdec_movie_new (SWFDEC_PLAYER (SWFDEC_AS_OBJECT (movie)->context), + mov->depth, mov->parent, resource, NULL, mov->name); + if (copy == NULL) + return...

...} else if (internal) { swfdec_resource_load (SWFDEC_PLAYER (cx), target, url, method, NULL, NULL); } else { diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index 547155b..90147a3 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -1724,35 +1724,6 @@ swfdec_movie_duplicate (SwfdecMovie *movie, const char *name, int depth) return copy; } -static void -swfdec_movie_load_variables_on_finish (SwfdecAsObject *target, - const char *text) -{ - if (text != NULL) - swfdec_as_object_decode (target, text); - - // only call onData for sprite movies - // FIXME...