diff options
author | Benjamin Otte <otte@gnome.org> | 2008-11-06 13:24:48 +0100 |
---|---|---|
committer | Benjamin Otte <otte@gnome.org> | 2008-11-06 13:24:48 +0100 |
commit | 50edfd99c413f3e06e46dee25a07bc59ba31b554 (patch) | |
tree | f31a4c51490e918b73d4494e7ab02bf066e91f40 | |
parent | 97ad53c37e964c81db79ff045fd3ba567e6179d9 (diff) |
make swfdec_as_value_to_boolean() take a SwfdecAsValue
-rw-r--r-- | swfdec/swfdec_as_boolean.c | 2 | ||||
-rw-r--r-- | swfdec/swfdec_as_interpret.c | 10 | ||||
-rw-r--r-- | swfdec/swfdec_as_native_function.c | 2 | ||||
-rw-r--r-- | swfdec/swfdec_as_types.c | 12 | ||||
-rw-r--r-- | swfdec/swfdec_as_types.h | 2 | ||||
-rw-r--r-- | swfdec/swfdec_movie_asprops.c | 4 | ||||
-rw-r--r-- | swfdec/swfdec_net_stream_as.c | 2 | ||||
-rw-r--r-- | swfdec/swfdec_player.c | 4 | ||||
-rw-r--r-- | swfdec/swfdec_selection.c | 2 | ||||
-rw-r--r-- | swfdec/swfdec_sprite_movie_as.c | 2 | ||||
-rw-r--r-- | swfdec/swfdec_text_format.c | 2 | ||||
-rw-r--r-- | swfdec/swfdec_xml.c | 4 |
12 files changed, 24 insertions, 24 deletions
diff --git a/swfdec/swfdec_as_boolean.c b/swfdec/swfdec_as_boolean.c index fda75192..e092e4a2 100644 --- a/swfdec/swfdec_as_boolean.c +++ b/swfdec/swfdec_as_boolean.c @@ -52,7 +52,7 @@ swfdec_as_boolean_construct (SwfdecAsContext *cx, SwfdecAsObject *object, { if (swfdec_as_context_is_constructing (cx)) { SwfdecAsBoolean *b = g_object_new (SWFDEC_TYPE_AS_BOOLEAN, "context", cx, NULL); - b->boolean = argc > 0 ? swfdec_as_value_to_boolean (cx, &argv[0]) : FALSE; + b->boolean = argc > 0 ? swfdec_as_value_to_boolean (cx, argv[0]) : FALSE; swfdec_as_object_set_relay (object, SWFDEC_AS_RELAY (b)); SWFDEC_AS_VALUE_SET_OBJECT (ret, object); } else { diff --git a/swfdec/swfdec_as_interpret.c b/swfdec/swfdec_as_interpret.c index dcf0dbbe..9669a5b3 100644 --- a/swfdec/swfdec_as_interpret.c +++ b/swfdec/swfdec_as_interpret.c @@ -1077,7 +1077,7 @@ swfdec_action_not (SwfdecAsContext *cx, guint action, const guint8 *data, guint swfdec_as_value_set_number (cx, swfdec_as_stack_peek (cx, 1), d == 0 ? 1 : 0); } else { SWFDEC_AS_VALUE_SET_BOOLEAN (swfdec_as_stack_peek (cx, 1), - !swfdec_as_value_to_boolean (cx, swfdec_as_stack_peek (cx, 1))); + !swfdec_as_value_to_boolean (cx, *swfdec_as_stack_peek (cx, 1))); } } @@ -1101,7 +1101,7 @@ swfdec_action_if (SwfdecAsContext *cx, guint action, const guint8 *data, guint l SWFDEC_ERROR ("If action length invalid (is %u, should be 2)", len); return; } - if (swfdec_as_value_to_boolean (cx, swfdec_as_stack_peek (cx, 1))) { + if (swfdec_as_value_to_boolean (cx, *swfdec_as_stack_peek (cx, 1))) { gint16 offset = data[0] | (data[1] << 8); cx->frame->pc += 5 + (int) offset; } @@ -1661,7 +1661,7 @@ swfdec_action_start_drag (SwfdecAsContext *cx, guint action, const guint8 *data, guint stack_size = 3; swfdec_as_stack_ensure_size (cx, 3); - center = swfdec_as_value_to_boolean (cx, swfdec_as_stack_peek (cx, 2)); + center = swfdec_as_value_to_boolean (cx, *swfdec_as_stack_peek (cx, 2)); if (swfdec_as_value_to_number (cx, swfdec_as_stack_peek (cx, 3))) { swfdec_as_stack_ensure_size (cx, 7); rect.x0 = swfdec_as_value_to_number (cx, swfdec_as_stack_peek (cx, 7)); @@ -2469,8 +2469,8 @@ swfdec_action_logical (SwfdecAsContext *cx, guint action, const guint8 *data, gu r = FALSE; } } else { - l = swfdec_as_value_to_boolean (cx, swfdec_as_stack_peek (cx, 1)); - r = swfdec_as_value_to_boolean (cx, swfdec_as_stack_peek (cx, 2)); + l = swfdec_as_value_to_boolean (cx, *swfdec_as_stack_peek (cx, 1)); + r = swfdec_as_value_to_boolean (cx, *swfdec_as_stack_peek (cx, 2)); } SWFDEC_AS_VALUE_SET_BOOLEAN (swfdec_as_stack_peek (cx, 2), diff --git a/swfdec/swfdec_as_native_function.c b/swfdec/swfdec_as_native_function.c index 7a1684da..3ad03794 100644 --- a/swfdec/swfdec_as_native_function.c +++ b/swfdec/swfdec_as_native_function.c @@ -325,7 +325,7 @@ swfdec_as_native_function_checkv (SwfdecAsContext *cx, SwfdecAsObject *object, case 'b': { gboolean *b = va_arg (varargs, gboolean *); - *b = swfdec_as_value_to_boolean (cx, &argv[i]); + *b = swfdec_as_value_to_boolean (cx, argv[i]); } break; case 'i': diff --git a/swfdec/swfdec_as_types.c b/swfdec/swfdec_as_types.c index 44b8172a..d8e554bd 100644 --- a/swfdec/swfdec_as_types.c +++ b/swfdec/swfdec_as_types.c @@ -612,28 +612,28 @@ swfdec_as_value_to_object (SwfdecAsContext *context, const SwfdecAsValue *value) * Returns: either %TRUE or %FALSE. **/ gboolean -swfdec_as_value_to_boolean (SwfdecAsContext *context, const SwfdecAsValue *value) +swfdec_as_value_to_boolean (SwfdecAsContext *context, SwfdecAsValue value) { g_return_val_if_fail (SWFDEC_IS_AS_CONTEXT (context), FALSE); /* FIXME: what do we do when called in flash 4? */ - switch (SWFDEC_AS_VALUE_GET_TYPE (*value)) { + switch (SWFDEC_AS_VALUE_GET_TYPE (value)) { case SWFDEC_AS_TYPE_UNDEFINED: case SWFDEC_AS_TYPE_NULL: return FALSE; case SWFDEC_AS_TYPE_BOOLEAN: - return SWFDEC_AS_VALUE_GET_BOOLEAN (*value); + return SWFDEC_AS_VALUE_GET_BOOLEAN (value); case SWFDEC_AS_TYPE_NUMBER: { - double d = SWFDEC_AS_VALUE_GET_NUMBER (*value); + double d = SWFDEC_AS_VALUE_GET_NUMBER (value); return d != 0.0 && !isnan (d); } case SWFDEC_AS_TYPE_STRING: if (context->version <= 6) { - double d = swfdec_as_value_to_number (context, value); + double d = swfdec_as_value_to_number (context, &value); return d != 0.0 && !isnan (d); } else { - return SWFDEC_AS_VALUE_GET_STRING (*value) != SWFDEC_AS_STR_EMPTY; + return SWFDEC_AS_VALUE_GET_STRING (value) != SWFDEC_AS_STR_EMPTY; } case SWFDEC_AS_TYPE_OBJECT: case SWFDEC_AS_TYPE_MOVIE: diff --git a/swfdec/swfdec_as_types.h b/swfdec/swfdec_as_types.h index 58ae39e4..c28644e1 100644 --- a/swfdec/swfdec_as_types.h +++ b/swfdec/swfdec_as_types.h @@ -119,7 +119,7 @@ void swfdec_as_value_set_number (SwfdecAsContext * context, /* value conversion functions */ gboolean swfdec_as_value_to_boolean (SwfdecAsContext * context, - const SwfdecAsValue * value); + SwfdecAsValue value); int swfdec_as_value_to_integer (SwfdecAsContext * context, const SwfdecAsValue * value); double swfdec_as_value_to_number (SwfdecAsContext * context, diff --git a/swfdec/swfdec_movie_asprops.c b/swfdec/swfdec_movie_asprops.c index 333d4a33..36f5dcd2 100644 --- a/swfdec/swfdec_movie_asprops.c +++ b/swfdec/swfdec_movie_asprops.c @@ -183,7 +183,7 @@ mc_visible_set (SwfdecMovie *movie, const SwfdecAsValue *val) { gboolean b; - b = swfdec_as_value_to_boolean (swfdec_gc_object_get_context (movie), val); + b = swfdec_as_value_to_boolean (swfdec_gc_object_get_context (movie), *val); if (b != movie->visible) { movie->visible = b; swfdec_movie_invalidate_last (movie); @@ -434,7 +434,7 @@ mc_focusrect_set (SwfdecMovie *movie, const SwfdecAsValue *val) return; b = d ? SWFDEC_FLASH_YES : SWFDEC_FLASH_NO; } else { - b = swfdec_as_value_to_boolean (cx, val) ? SWFDEC_FLASH_YES : SWFDEC_FLASH_NO; + b = swfdec_as_value_to_boolean (cx, *val) ? SWFDEC_FLASH_YES : SWFDEC_FLASH_NO; } } diff --git a/swfdec/swfdec_net_stream_as.c b/swfdec/swfdec_net_stream_as.c index f69369c1..60d500fb 100644 --- a/swfdec/swfdec_net_stream_as.c +++ b/swfdec/swfdec_net_stream_as.c @@ -69,7 +69,7 @@ swfdec_net_stream_pause (SwfdecAsContext *cx, SwfdecAsObject *object, if (argc == 0) { playing = !swfdec_net_stream_get_playing (stream); } else { - playing = !swfdec_as_value_to_boolean (cx, &argv[0]); + playing = !swfdec_as_value_to_boolean (cx, argv[0]); } SWFDEC_LOG ("%s stream %p", playing ? "playing" : "pausing", stream); swfdec_net_stream_set_playing (stream, playing); diff --git a/swfdec/swfdec_player.c b/swfdec/swfdec_player.c index 35e2d0fc..0696cb45 100644 --- a/swfdec/swfdec_player.c +++ b/swfdec/swfdec_player.c @@ -1510,7 +1510,7 @@ swfdec_player_get_tab_movies (SwfdecPlayer *player, const GList *current) ret = g_list_prepend (ret, actor); } else if (SWFDEC_MOVIE (actor)->parent != NULL) { swfdec_as_object_get_variable (object, SWFDEC_AS_STR_tabEnabled, &val); - if (swfdec_as_value_to_boolean (SWFDEC_AS_CONTEXT (player), &val)) { + if (swfdec_as_value_to_boolean (SWFDEC_AS_CONTEXT (player), val)) { /* Flash queries again - why not? :/ */ swfdec_as_object_get_variable (object, SWFDEC_AS_STR_tabEnabled, &val); ret = g_list_prepend (ret, actor); @@ -1526,7 +1526,7 @@ swfdec_player_get_tab_movies (SwfdecPlayer *player, const GList *current) swfdec_as_object_get_variable (object, SWFDEC_AS_STR_tabChildren, &val); if (SWFDEC_AS_VALUE_IS_UNDEFINED (val) || - swfdec_as_value_to_boolean (SWFDEC_AS_CONTEXT (player), &val)) { + swfdec_as_value_to_boolean (SWFDEC_AS_CONTEXT (player), val)) { GList *list; swfdec_sandbox_unuse (SWFDEC_MOVIE (actor)->resource->sandbox); list = swfdec_player_get_tab_movies (player, SWFDEC_MOVIE (actor)->list); diff --git a/swfdec/swfdec_selection.c b/swfdec/swfdec_selection.c index 2fa2c855..14205e5b 100644 --- a/swfdec/swfdec_selection.c +++ b/swfdec/swfdec_selection.c @@ -120,7 +120,7 @@ swfdec_actor_can_grab_focus (SwfdecActor *actor) if (!swfdec_as_object_get_variable (swfdec_as_relay_get_as_object (SWFDEC_AS_RELAY (actor)), SWFDEC_AS_STR_focusEnabled, &val)) return swfdec_actor_get_mouse_events (actor); - return swfdec_as_value_to_boolean (swfdec_gc_object_get_context (actor), &val); + return swfdec_as_value_to_boolean (swfdec_gc_object_get_context (actor), val); } else if (SWFDEC_IS_TEXT_FIELD_MOVIE (actor)) { /* cool that you can select all textfields, eh? */ return TRUE; diff --git a/swfdec/swfdec_sprite_movie_as.c b/swfdec/swfdec_sprite_movie_as.c index 9f8c32f8..c8a447b0 100644 --- a/swfdec/swfdec_sprite_movie_as.c +++ b/swfdec/swfdec_sprite_movie_as.c @@ -637,7 +637,7 @@ swfdec_sprite_movie_startDrag (SwfdecAsContext *cx, SwfdecAsObject *object, SWFDEC_AS_CHECK (SWFDEC_TYPE_ACTOR, &actor, ""); if (argc > 0) { - center = swfdec_as_value_to_boolean (cx, &argv[0]); + center = swfdec_as_value_to_boolean (cx, argv[0]); } if (argc >= 5) { SwfdecRect rect; diff --git a/swfdec/swfdec_text_format.c b/swfdec/swfdec_text_format.c index 1187d309..43cb5b0e 100644 --- a/swfdec/swfdec_text_format.c +++ b/swfdec/swfdec_text_format.c @@ -197,7 +197,7 @@ swfdec_text_format_set_boolean (SwfdecAsObject *object, SWFDEC_TEXT_ATTRIBUTE_UNSET (format->values_set, property); } else { G_STRUCT_MEMBER (gboolean, format, property_offsets[property]) = - swfdec_as_value_to_boolean (context, &argv[0]); + swfdec_as_value_to_boolean (context, argv[0]); SWFDEC_TEXT_ATTRIBUTE_SET (format->values_set, property); } } diff --git a/swfdec/swfdec_xml.c b/swfdec/swfdec_xml.c index 402f6cd7..8e9e3e4b 100644 --- a/swfdec/swfdec_xml.c +++ b/swfdec/swfdec_xml.c @@ -209,7 +209,7 @@ swfdec_xml_set_ignoreWhite (SwfdecAsContext *cx, SwfdecAsObject *object, return; xml->ignore_white = - swfdec_as_value_to_boolean (cx, &argv[0]); + swfdec_as_value_to_boolean (cx, argv[0]); } static void @@ -326,7 +326,7 @@ swfdec_xml_set_loaded (SwfdecAsContext *cx, SwfdecAsObject *object, return; SWFDEC_AS_VALUE_SET_BOOLEAN (&xml->loaded, - swfdec_as_value_to_boolean (cx, &argv[0])); + swfdec_as_value_to_boolean (cx, argv[0])); } static void |