search for: swfdec_is_movi

...ot;swfdec_debug.h" G_DEFINE_TYPE (SwfdecAsArray, swfdec_as_array, SWFDEC_TYPE_AS_OBJECT) @@ -590,7 +591,7 @@ swfdec_as_array_join (SwfdecAsContext *cx, SwfdecAsObject *object, guint argc, const char *var, *str, *sep; SwfdecAsValue val; - if (object == NULL) + if (object == NULL || SWFDEC_IS_MOVIE (object)) return; if (argc > 0) { @@ -626,7 +627,7 @@ void swfdec_as_array_toString (SwfdecAsContext *cx, SwfdecAsObject *object, guint argc, SwfdecAsValue *argv, SwfdecAsValue *ret) { - if (object == NULL) + if (object == NULL || SWFDEC_IS_MOVIE (object)) return; s...

...mp;val)) ++ if (!swfdec_as_object_get_variable (SWFDEC_AS_OBJECT (movie), name, &val)) + return NULL; + if (!SWFDEC_AS_VALUE_IS_OBJECT (&val)) + return NULL; - ret = SWFDEC_AS_VALUE_GET_OBJECT (&val); ++ ret = (SwfdecMovie *) SWFDEC_AS_VALUE_GET_OBJECT (&val); + if (!SWFDEC_IS_MOVIE (ret)) + return NULL; + return ret; +} + /** * swfdec_action_get_movie_by_path: * @cx: a #SwfdecAsContext @@@ -445,9 -426,10 +445,26 @@@ swfdec_action_get_movie_by_path (SwfdecAsContext *cx, const char *path, SwfdecAsObject **object, const char **variable) { -- SwfdecAs...

....org/git/swfdec into as Conflicts: libswfdec/swfdec_as_interpret.c diff --cc libswfdec/swfdec_as_interpret.c index 288c47d,e09b09f..4f84189 @@@ -55,8 -74,9 +55,8 @@@ static void swfdec_action_stop (SwfdecAsContext *cx, guint action, const guint8 *data, guint len) { - if (SWFDEC_IS_MOVIE (cx->frame->target)) - SWFDEC_MOVIE (cx->frame->target)->stopped = TRUE; - SwfdecSpriteMovie *movie = swfdec_action_get_target (cx); - if (movie) - movie->playing = FALSE; ++ if (SWFDEC_IS_SPRITE_MOVIE (cx->frame->target)) ++ SWFDEC_SPRITE_MOVIE (cx->fram...

...", G_CALLBACK (notify_initialized), movie); diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index b33eff7..908e0ef 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -220,12 +220,13 @@ swfdec_movie_set_content (SwfdecMovie *m { g_return_if_fail (SWFDEC_IS_MOVIE (movie)); + if (content == NULL) + content = &default_content; + if (movie->content == content) return; - if (content == NULL) { - content = &default_content; - } else if (movie->content != &default_content) { + if (movie->content != &default_content...

...break; - default: - g_assert_not_reached (); + + /* get objects compared */ + if (ltype == SWFDEC_AS_TYPE_OBJECT && rtype == SWFDEC_AS_TYPE_OBJECT) { + SwfdecAsObject *lo = SWFDEC_AS_VALUE_GET_OBJECT (lval); + SwfdecAsObject *ro = SWFDEC_AS_VALUE_GET_OBJECT (rval); + + if (SWFDEC_IS_MOVIE (lo) && SWFDEC_IS_MOVIE (ro)) { + /* do nothing */ + } else if (SWFDEC_IS_MOVIE (lo)) { + swfdec_as_value_to_primitive (rval); + rtype = rval->type; + if (rtype != SWFDEC_AS_TYPE_OBJECT) { cond = FALSE; - break; + goto out; + } + ro = SWFDEC_AS_VALUE_G...

...ec_as_interpret.c @@ -470,8 +470,14 @@ swfdec_action_lookup_object (SwfdecAsContext *cx, SwfdecAsObject *o, const char gboolean dot_allowed = TRUE; const char *start; - if (path == end) - return NULL; + if (path == end) { + if (o == NULL) + o = cx->frame->target; + if (SWFDEC_IS_MOVIE (o)) + return o; + else + return NULL; + } if (path[0] == '/') { o = cx->frame->target; @@ -550,8 +556,10 @@ swfdec_player_get_movie_from_value (SwfdecPlayer *player, SwfdecAsValue *val) cx = SWFDEC_AS_CONTEXT (player); s = swfdec_as_value_to_string (cx,...

..._sprite_movie_hitTest (SwfdecAsCon SwfdecMovie *movie = SWFDEC_MOVIE (obj); if (argc == 1) { - SwfdecMovie *other, *tmp; + SwfdecMovie *other; SwfdecRect movie_rect, other_rect; - guint movie_depth, other_depth; if (!SWFDEC_AS_VALUE_IS_OBJECT (&argv[0]) || !SWFDEC_IS_MOVIE (other = (SwfdecMovie *) SWFDEC_AS_VALUE_GET_OBJECT (&argv[0]))) { SWFDEC_ERROR ("FIXME: what happens now?"); @@ -170,70 +169,29 @@ swfdec_sprite_movie_hitTest (SwfdecAsCon } swfdec_movie_update (movie); swfdec_movie_update (other); - if (movie->parent !=...

...ex 2325138..a3772c8 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -564,6 +564,32 @@ swfdec_movie_rect_local_to_global (SwfdecMovie *movie, SwfdecRect *rect) } void +swfdec_movie_global_to_local_matrix (SwfdecMovie *movie, cairo_matrix_t *matrix) +{ + g_return_if_fail (SWFDEC_IS_MOVIE (movie)); + g_return_if_fail (matrix != NULL); + + cairo_matrix_init_identity (matrix); + while (movie) { + cairo_matrix_multiply (matrix, &movie->inverse_matrix, matrix); + movie = movie->parent; + } +} + +void +swfdec_movie_local_to_global_matrix (SwfdecMovie *movie, cairo_ma...

...wfdec_movie_set_static_properties (SwfdecMovie *movie, const cairo_matrix_t *transform, - const SwfdecColorTransform *ctrans, guint ratio, int clip_depth, SwfdecEventList *events) + const SwfdecColorTransform *ctrans, int ratio, int clip_depth, SwfdecEventList *events) { g_return_if_fail (SWFDEC_IS_MOVIE (movie)); g_return_if_fail (clip_depth >= -16384 || clip_depth <= 0); + g_return_if_fail (ratio >= -1); if (movie->modified) { SWFDEC_LOG ("%s has already been modified by scripts, ignoring updates", movie->name); @@ -963,11 +964,11 @@ swfdec_movie_set_static...

...n_init (SwfdecMovie *movie) +static void +swfdec_movie_set_constructor (SwfdecSpriteMovie *movie) { - SwfdecPlayer *player; + SwfdecMovie *mov = SWFDEC_MOVIE (movie); + SwfdecAsContext *context = SWFDEC_AS_OBJECT (movie)->context; + SwfdecAsObject *constructor = NULL; - g_return_if_fail (SWFDEC_IS_MOVIE (movie)); + g_assert (mov->resource != NULL); - player = SWFDEC_PLAYER (SWFDEC_AS_OBJECT (movie)->context); - g_queue_remove (player->init_queue, movie); - swfdec_movie_execute_script (movie, SWFDEC_EVENT_INITIALIZE); -} + if (movie->sprite) { + const char *name; -/** - * s...

...dot + 1, ".:")) + return FALSE; + } + /* a colon at the beginning may not be the only separator */ + if (path[0] == ':') { + if (strpbrk (path + 1, ".:/") == NULL) + return FALSE; + else + path++; + } + + movie = cx->frame->target; + if (!SWFDEC_IS_MOVIE (movie)) { + SWFDEC_FIXME ("target is not a movie"); + } else { + if (path[0] == '/') { + /* if path starts with a slash, start from the root movie */ + while (SWFDEC_MOVIE (movie)->parent) + movie = SWFDEC_AS_OBJECT (SWFDEC_MOVIE (movie)->parent); + p...

...E; - } else { - return TRUE; + destroy = FALSE; } + if (destroy) + swfdec_movie_destroy (movie); + return destroy; } /** @@ -298,16 +299,14 @@ swfdec_movie_do_remove (SwfdecMovie *movie) void swfdec_movie_remove (SwfdecMovie *movie) { - gboolean result; - g_return_if_fail (SWFDEC_IS_MOVIE (movie)); if (movie->state > SWFDEC_MOVIE_STATE_RUNNING) return; - result = swfdec_movie_do_remove (movie); - movie->state = SWFDEC_MOVIE_STATE_REMOVED; - if (result) - swfdec_movie_destroy (movie); + if (swfdec_movie_do_remove (movie, TRUE)) + return; + + swfdec_mo...

...as_interpret.c +++ b/libswfdec/swfdec_as_interpret.c @@ -1346,13 +1346,9 @@ swfdec_action_equals2_5 (SwfdecAsContext *cx, guint action, const guint8 *data, SwfdecAsObject *lo = SWFDEC_AS_VALUE_GET_OBJECT (&ltmp); SwfdecAsObject *ro = SWFDEC_AS_VALUE_GET_OBJECT (&rtmp); - if (!SWFDEC_IS_MOVIE (lo)) - lo = SWFDEC_AS_VALUE_GET_OBJECT (lval); - if (!SWFDEC_IS_MOVIE (ro)) - ro = SWFDEC_AS_VALUE_GET_OBJECT (rval); - if (SWFDEC_IS_MOVIE (lo) && SWFDEC_IS_MOVIE (ro)) { - /* do nothing */ + lo = SWFDEC_AS_OBJECT (swfdec_movie_resolve (SWFDEC_MOVIE (lo))); +...

...action_define_function (SwfdecAsC } if (fun == NULL) return; + /* This is a hack that should only trigger for functions defined in the init scripts. + * It is supposed to ensure that those functions inherit their target when being + * called instead of when being defined */ + if (!SWFDEC_IS_MOVIE (frame->original_target)) + SWFDEC_AS_SCRIPT_FUNCTION (fun)->target = NULL; /* attach the function */ if (*function_name == '\0') { swfdec_as_stack_ensure_free (cx, 1); diff --git a/libswfdec/swfdec_as_script_function.h b/libswfdec/swfdec_as_script_function.h index c82a...

...SwfdecContent to set for this movie or NULL to unset - * - * Sets new contents for @movie. Note that name and graphic of @content must - * be identical to the current content of @movie. - **/ -void -swfdec_movie_set_content (SwfdecMovie *movie, const SwfdecContent *content) -{ - g_return_if_fail (SWFDEC_IS_MOVIE (movie)); - - if (content == NULL) - content = &default_content; - - if (movie->content == content) - return; - - if (movie->content != &default_content && content != &default_content) { - g_return_if_fail (movie->depth == content->depth); - g_return_...

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

vivified/ui/main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) New commits: diff-tree be3bc1a6cd88c0f2294b4f6059898c3989f172eb (from da8a9e9b145d5cb1aebc04764e9ed66856a31c9b) Author: Benjamin Otte <otte at gnome.org> Date: Thu Aug 16 21:42:39 2007 +0200 Set the title correctly diff --git a/vivified/ui/main.c b/vivified/ui/main.c index df123a9..13d03ab 100644 ---

libswfdec/swfdec_as_interpret.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) New commits: diff-tree 9c5cb7cb9f6278896bc8a1e7cd7fb541b079c8de (from 1e19719b58b5cfcb800c81a5f5432c3ad662dbbc) Author: Benjamin Otte <otte at gnome.org> Date: Wed Jun 20 20:58:52 2007 +0200 the modulo arguments were mixed diff --git a/libswfdec/swfdec_as_interpret.c

...last: + * @movie: a #SwfdecMovie + * + * Ensures the movie's contents are invalidated. This function must be called + * before changing the movie or the output will have artifacts. + **/ +void +swfdec_movie_invalidate_last (SwfdecMovie *movie) +{ + cairo_matrix_t matrix; + + g_return_if_fail (SWFDEC_IS_MOVIE (movie)); + + if (movie->invalidate_last) + return; + + if (movie->parent) + swfdec_movie_local_to_global_matrix (movie->parent, &matrix); + else + cairo_matrix_init_identity (&matrix); + swfdec_movie_invalidate (movie, &matrix, FALSE); + g_assert (movie->inva...

...G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + movie_class->iterate_end = swfdec_movie_iterate_end; } @@ -894,6 +935,25 @@ swfdec_movie_initialize (SwfdecMovie *mo klass->init_movie (movie); } +void +swfdec_movie_set_depth (SwfdecMovie *movie, int depth) +{ + g_return_if_fail (SWFDEC_IS_MOVIE (movie)); + + if (movie->depth == depth) + return; + + swfdec_movie_invalidate (movie); + movie->depth = depth; + if (movie->parent) { + movie->parent->list = g_list_sort (movie->parent->list, swfdec_movie_compare_depths); + } else { + SwfdecPlayer *player = SWFD...