search for: stage_width

...ctions) == NULL); swfdec_ring_buffer_free (player->actions); g_assert (player->movies == NULL); @@ -1400,6 +1403,8 @@ swfdec_player_initialize (SwfdecPlayer * player->rate = rate; player->width = width; player->height = height; + player->internal_width = player->stage_width >=0 ? (guint) player->stage_width : player->width; + player->internal_height = player->stage_height >=0 ? (guint) player->stage_height : player->height; player->initialized = TRUE; if (rate) { player->iterate_timeout.timestamp = player->time + SWFDEC_TIC...

...g_value_set_enum (value, player->mouse_cursor); + g_value_set_enum (value, priv->mouse_cursor); break; case PROP_NEXT_EVENT: g_value_set_uint (value, swfdec_player_get_next_event (player)); break; case PROP_WIDTH: - g_value_set_int (value, player->stage_width); + g_value_set_int (value, priv->stage_width); break; case PROP_HEIGHT: - g_value_set_int (value, player->stage_height); + g_value_set_int (value, priv->stage_height); break; case PROP_ALIGNMENT: - g_value_set_enum (value, swfdec_player_alignmen...

...dex 23083d0..f73bd94 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -438,6 +438,75 @@ swfdec_player_get_property (GObject *obj } static void +swfdec_player_update_scale (SwfdecPlayer *player) +{ + int width, height; + double scale_x, scale_y; + + width = player->stage_width >= 0 ? player->stage_width : (int) player->width; + height = player->stage_height >= 0 ? player->stage_height : (int) player->height; + if (height == 0 || width == 0) { + player->scale_x = 1.0; + player->scale_y = 1.0; + player->offset_x = 0; + player-&gt...

...player has initialized its basic values", @@ -1733,6 +1714,27 @@ swfdec_player_get_size (SwfdecPlayer *pl *height = player->stage_height; } +static void +swfdec_player_set_size_internal (SwfdecPlayer *player, int width, int height) +{ + gboolean changed = FALSE; + + if (player->stage_width != width) { + player->stage_width = width; + g_object_notify (G_OBJECT (player), "width"); + changed = TRUE; + } + if (player->stage_height != height) { + player->stage_height = height; + g_object_notify (G_OBJECT (player), "height"); + changed = TRU...

...dth) { + player->width = width; + g_object_notify (G_OBJECT (player), "default-width"); + } + if (player->height != height) { + player->height = height; + g_object_notify (G_OBJECT (player), "default-height"); + } player->internal_width = player->stage_width >= 0 ? (guint) player->stage_width : player->width; player->internal_height = player->stage_height >= 0 ? (guint) player->stage_height : player->height; - player->initialized = TRUE; - if (rate) { - player->iterate_timeout.timestamp = player->time; - swfd...

...g_object_notify (G_OBJECT (player), "alignment"); } } + +SWFDEC_AS_NATIVE (666, 5, get_width) +void +get_width (SwfdecAsContext *cx, SwfdecAsObject *object, + guint argc, SwfdecAsValue *argv, SwfdecAsValue *ret) +{ + SwfdecPlayer *player = SWFDEC_PLAYER (cx); + + if (player->stage_width > -1) { + SWFDEC_AS_VALUE_SET_INT (ret, player->stage_width); + } else { + SWFDEC_AS_VALUE_SET_INT (ret, player->width); + } +} + +SWFDEC_AS_NATIVE (666, 7, get_height) +void +get_height (SwfdecAsContext *cx, SwfdecAsObject *object, + guint argc, SwfdecAsValue *argv, SwfdecAsVal...

...t;offset_x; - x = MAX (x, 0.0); - y = SWFDEC_TWIPS_TO_DOUBLE (player->invalid.y0) * player->scale_y + player->offset_y; - y = MAX (y, 0.0); - width = SWFDEC_TWIPS_TO_DOUBLE (player->invalid.x1 - player->invalid.x0) * player->scale_x; - width = MIN (width, player->stage_width - x); - height = SWFDEC_TWIPS_TO_DOUBLE (player->invalid.y1 - player->invalid.y0) * player->scale_y; - height = MIN (height, player->stage_height - y); + swfdec_player_global_to_stage (player, &player->invalid.x0, &player->invalid.y0); + swfdec_player_global_to...

...ll_sounds (player); + swfdec_player_resource_request_finish (player); g_hash_table_destroy (player->registered_classes); while (player->roots) @@ -1611,6 +1613,8 @@ swfdec_player_init (SwfdecPlayer *player) player->iterate_timeout.callback = swfdec_player_iterate; player->stage_width = -1; player->stage_height = -1; + + swfdec_player_resource_request_init (player); } void @@ -1690,42 +1694,75 @@ swfdec_player_invalidate (SwfdecPlayer *player, const SwfdecRect *rect) /** * swfdec_player_get_level: * @player: a #SwfdecPlayer - * @name: name of the level to request...

...ec_player_init (SwfdecPlayer *player) player->mouse_visible = TRUE; player->mouse_cursor = SWFDEC_MOUSE_CURSOR_NORMAL; player->iterate_timeout.callback = swfdec_player_iterate; - player->init_queue = g_queue_new (); - player->construct_queue = g_queue_new (); player->stage_width = -1; player->stage_height = -1; } @@ -1836,7 +1889,7 @@ swfdec_player_initialize (SwfdecPlayer *player, guint version, player->internal_height = player->stage_height >= 0 ? (guint) player->stage_height : player->height; player->initialized = TRUE; if (rate) { -...

...swfdec_as_object_mark, NULL); swfdec_function_list_execute (&priv->rooted, player); swfdec_as_object_mark (SWFDEC_AS_OBJECT (priv->resource)); @@ -1791,8 +1791,6 @@ swfdec_player_init (SwfdecPlayer *player) priv->iterate_timeout.callback = swfdec_player_iterate; priv->stage_width = -1; priv->stage_height = -1; - - priv->sandboxes = g_hash_table_new (swfdec_url_hash, swfdec_url_equal); } void diff --git a/libswfdec/swfdec_player_internal.h b/libswfdec/swfdec_player_internal.h index 8c9e819..889a1ee 100644 --- a/libswfdec/swfdec_player_internal.h +++ b/libswfdec...