search for: swfdec_player_add_level_from_load

...; Date: Sat Feb 17 12:44:53 2007 +0100 use swfdec_scriptable_set_variables if variables are set on the loader diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index cbdac1b..2255771 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -870,9 +870,11 @@ swfdec_player_add_level_from_loader (Swf movie = swfdec_movie_new_for_player (player, depth); root = SWFDEC_ROOT_MOVIE (movie); + root->player = player; root->loader = loader; + if (variables) + swfdec_scriptable_set_variables (SWFDEC_SCRIPTABLE (movie), variables); swfdec_loader_set_target (root->loader...

...h +++ b/libswfdec/swfdec_player_internal.h @@ -198,7 +198,6 @@ void swfdec_player_stop_all_sounds (SwfdecPlayer * player); SwfdecSpriteMovie * swfdec_player_get_level (SwfdecPlayer * player, const char * name, - gboolean ignore_case, gboolean create); SwfdecMovie * swfdec_player_add_level_from_loader (SwfdecPlayer * player, commit 42f1dcc0e604d0ddba306039b0b5e566d8ed3561 Author: Benjamin Otte <otte at gnome.org> Date: Wed Oct 17 11:34:03 2007 +0200 reset n_frames, too diff --git a/libswfdec/swfdec_sprite_movie.c b/libswfdec/swfdec_sprite_movie.c index 11c1bf4..74dd86e 1...

...t; if (swfdec_as_context_use_mem (SWFDEC_AS_CONTEXT (player), sizeof (SwfdecRootMovie))) { g_object_ref (ret); diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 54a2707..288e9ef 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -968,7 +968,6 @@ swfdec_player_add_level_from_loader (Swf swfdec_player_remove_level (player, depth); movie = swfdec_movie_new_for_player (player, depth); root = SWFDEC_ROOT_MOVIE (movie); - root->player = player; root->loader = loader; if (variables) swfdec_movie_set_variables (movie, variables); diff --git a/libswfdec/s...

...ource) { + g_object_unref (player->resource); + player->resource = NULL; } if (player->system) { g_object_unref (player->system); @@ -1632,23 +1628,6 @@ swfdec_player_get_level (SwfdecPlayer *player, const char *name, SwfdecResource return movie; } -SwfdecMovie * -swfdec_player_add_level_from_loader (SwfdecPlayer *player, guint depth, - SwfdecLoader *loader, const char *variables) -{ - SwfdecResource *resource; - SwfdecMovie *movie; - const char *name; - - swfdec_player_remove_level (player, depth); - name = swfdec_as_context_give_string (SWFDEC_AS_CONTEXT (player), g_strdup_printf (...

...ecRootMovie *root, const char *url, const char *target) { g_return_if_fail (SWFDEC_IS_ROOT_MOVIE (root)); @@ -196,9 +190,8 @@ swfdec_root_movie_load (SwfdecRootMovie } else { SwfdecLoader *loader = swfdec_loader_load (root->loader, url); if (loader) { - SwfdecRootMovie *added = swfdec_player_add_level_from_loader (root->player, depth, loader, NULL); - swfdec_player_add_action (root->player, SWFDEC_MOVIE (added), - swfdec_root_movie_do_parse, NULL); + swfdec_player_add_level_from_loader (root->player, depth, loader, NULL); + swfdec_loader_queue_parse (loader); } else { SWFDEC_WAR...

...face->parse != NULL); diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index 3a2980d..a696967 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -1113,7 +1113,6 @@ swfdec_movie_load (SwfdecMovie *movie, c request, data, data_len); g_assert (loader); swfdec_player_add_level_from_loader (player, depth, loader, NULL); - swfdec_loader_queue_parse (loader); } } else { SWFDEC_ERROR ("%s does not specify a valid level", target); diff --git a/libswfdec/swfdec_net_stream.c b/libswfdec/swfdec_net_stream.c index 9addf77..2734ec6 100644 --- a/libswfdec/swfdec_...

...ble_destroy (player->registered_classes); - g_list_foreach (player->roots, (GFunc) swfdec_movie_destroy, NULL); - g_list_free (player->roots); + while (player->roots) + swfdec_movie_destroy (player->roots->data); swfdec_js_finish_player (player); @@ -945,8 +945,8 @@ swfdec_player_add_level_from_loader (Swf { SwfdecMovie *movie; SwfdecRootMovie *root; - GList *found; + swfdec_player_remove_level (player, depth); movie = swfdec_movie_new_for_player (player, depth); root = SWFDEC_ROOT_MOVIE (movie); root->player = player; @@ -954,13 +954,6 @@ swfdec_player_add_level_from_lo...

...ayer); - swfdec_player_perform_actions (player); target_time = player->time + SWFDEC_MSECS_TO_TICKS (msecs); SWFDEC_DEBUG ("advancing %u msecs (%u audio frames)", msecs, audio_samples); @@ -1532,7 +1535,6 @@ swfdec_player_set_loader_with_variables g_object_ref (loader); swfdec_player_add_level_from_loader (player, 0, loader, variables); swfdec_player_perform_external_actions (player); - swfdec_player_perform_actions (player); swfdec_player_unlock (player); } diff-tree aa1a1a77ecc548d912c813af4d396506b7cb0f37 (from 1440c9f36abb495dfa96d60ea2c7b31857544cc9) Author: Benjamin Otte <otte a...

...iables) { g_return_if_fail (SWFDEC_IS_PLAYER (player)); - g_return_if_fail (player->roots == NULL); + g_return_if_fail (player->loader == NULL); g_return_if_fail (SWFDEC_IS_LOADER (loader)); - swfdec_player_lock (player); player->loader = loader; g_object_ref (loader); swfdec_player_add_level_from_loader (player, 0, loader, variables); - swfdec_player_perform_external_actions (player); - swfdec_player_unlock (player); } /** @@ -1934,11 +1938,10 @@ swfdec_player_render (SwfdecPlayer *play * often as the SwfdecPlayer::next-event property indicates. **/ void -swfdec_player_advance (Swfdec...

...+160,8 @@ void swfdec_player_set_drag_movie (Swfd SwfdecMovie * drag, gboolean center, SwfdecRect * rect); +void swfdec_player_set_align_flags (SwfdecPlayer * player, + guint flags); void swfdec_player_stop_all_sounds (SwfdecPlayer * player); SwfdecMovie * swfdec_player_add_level_from_loader (SwfdecPlayer * player, diff --git a/libswfdec/swfdec_stage_as.c b/libswfdec/swfdec_stage_as.c index 119d69c..eee9a6b 100644 --- a/libswfdec/swfdec_stage_as.c +++ b/libswfdec/swfdec_stage_as.c @@ -21,6 +21,7 @@ #include "config.h" #endif +#include <string.h> #include...

...00 handle movie variables differently variables are now auto-parsed from the URL's query string. diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index c7a67c9..78493bf 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -1293,10 +1293,8 @@ swfdec_player_add_level_from_loader (Swf name = swfdec_as_context_give_string (SWFDEC_AS_CONTEXT (player), g_strdup_printf ("_level%u", depth)); movie = swfdec_movie_new (player, depth - 16384, NULL, NULL, name); movie->name = SWFDEC_AS_STR_EMPTY; - swfdec_swf_instance_new (SWFDEC_SPRITE_MOVIE (movie), loader...

...launch (SwfdecPlayer *player, const char *url, const char *target) { @@ -1057,6 +1071,8 @@ swfdec_player_set_loader_with_variables g_return_if_fail (player->roots == NULL); g_return_if_fail (SWFDEC_IS_LOADER (loader)); + player->loader = loader; + g_object_ref (loader); movie = swfdec_player_add_level_from_loader (player, 0, loader, variables); swfdec_loader_parse (loader); } diff --git a/libswfdec/swfdec_player_internal.h b/libswfdec/swfdec_player_internal.h index 2e63b78..6d40273 100644 --- a/libswfdec/swfdec_player_internal.h +++ b/libswfdec/swfdec_player_internal.h @@ -49,6 +49,7 @@ struct _Swfdec...

...} - /* Step 2: start the iteration. This performs a goto next frame on all + /* start the iteration. This performs a goto next frame on all * movies that are not stopped. It also queues onEnterFrame. */ for (walk = player->movies; walk; walk = walk->next) { @@ -963,9 +957,12 @@ swfdec_player_add_level_from_loader (Swf SwfdecLoader *loader, const char *variables) { SwfdecMovie *movie; + const char *name; swfdec_player_remove_level (player, depth); - movie = swfdec_movie_new_for_player (player, depth); + name = swfdec_as_context_give_string (SWFDEC_AS_CONTEXT (player), g_strdup_printf (&quo...

...+122,8 @@ void swfdec_player_set_drag_movie (Swfd SwfdecMovie * drag, gboolean center, SwfdecRect * rect); +void swfdec_player_trace (SwfdecPlayer * player, + const char * text); void swfdec_player_stop_all_sounds (SwfdecPlayer * player); SwfdecRootMovie * swfdec_player_add_level_from_loader (SwfdecPlayer * player, diff --git a/libswfdec/swfdec_script.c b/libswfdec/swfdec_script.c index 49ad92f..ed5ac44 100644 --- a/libswfdec/swfdec_script.c +++ b/libswfdec/swfdec_script.c @@ -31,6 +31,7 @@ #include "swfdec_decoder.h" #include "swfdec_js.h" #include &q...

...XT (player)); + player->registered_classes = g_hash_table_new_full (g_direct_hash, g_direct_equal, + NULL, NULL); player->actions = swfdec_ring_buffer_new_for_type (SwfdecPlayerAction, 16); player->cache = swfdec_cache_new (50 * 1024 * 1024); /* 100 MB */ @@ -960,7 +972,7 @@ swfdec_player_add_level_from_loader (Swf root->player = player; root->loader = loader; if (variables) - swfdec_scriptable_set_variables (SWFDEC_SCRIPTABLE (movie), variables); + swfdec_movie_set_variables (movie, variables); swfdec_loader_set_target (root->loader, SWFDEC_LOADER_TARGET (root)); return r...

...+122,8 @@ void swfdec_player_set_drag_movie (Swfd SwfdecMovie * drag, gboolean center, SwfdecRect * rect); +void swfdec_player_trace (SwfdecPlayer * player, + const char * text); void swfdec_player_stop_all_sounds (SwfdecPlayer * player); SwfdecRootMovie * swfdec_player_add_level_from_loader (SwfdecPlayer * player, diff --git a/libswfdec/swfdec_script.c b/libswfdec/swfdec_script.c index 49ad92f..ed5ac44 100644 --- a/libswfdec/swfdec_script.c +++ b/libswfdec/swfdec_script.c @@ -31,6 +31,7 @@ #include "swfdec_decoder.h" #include "swfdec_js.h" #include &q...