search for: swfdec_player_dispose

libswfdec/swfdec_player.c | 3 +++ 1 file changed, 3 insertions(+) New commits: commit f82b818ab4cf2148fafbb9eec5a27622ccd680d7 Author: Benjamin Otte <otte at gnome.org> Date: Sun Oct 14 17:04:21 2007 +0200 lock the player when handling keys ooooops diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 32254ab..4980b21 100644 ---

...branch 'master' of ssh://medar at git.freedesktop.org/git/swfdec/swfdec Conflicts: libswfdec/swfdec_player.c diff --cc libswfdec/swfdec_player.c index 5db8a3e,efe2798..8191f6a --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@@ -838,18 -860,16 +860,18 @@@ swfdec_player_dispose (GObject *object swfdec_player_stop_all_sounds (player); swfdec_player_resource_request_finish (player); - g_hash_table_destroy (player->registered_classes); + g_hash_table_destroy (priv->registered_classes); - while (player->roots) - swfdec_movie_destroy (player-&g...

...k; + } + player->timeouts = g_list_insert_before (player->timeouts, walk, timeout); if (next_tick != swfdec_player_get_next_event_time (player)) g_object_notify (G_OBJECT (player), "next-event"); } @@ -329,7 +322,6 @@ swfdec_player_set_property (GObject *obj static void swfdec_player_dispose (GObject *object) { - GList *walk; SwfdecPlayer *player = SWFDEC_PLAYER (object); swfdec_player_stop_all_sounds (player); @@ -337,28 +329,16 @@ swfdec_player_dispose (GObject *object) g_list_foreach (player->roots, (GFunc) swfdec_movie_destroy, NULL); g_list_free (player->root...

...Benjamin Otte <otte at gnome.org> Date: Thu Aug 2 16:05:57 2007 +0200 make resizing use external events diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 78493bf..a8e648a 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -644,6 +644,9 @@ swfdec_player_dispose (GObject *object) } } #endif + swfdec_player_remove_all_external_actions (player, player); + g_assert (swfdec_ring_buffer_pop (player->external_actions) == NULL); + swfdec_ring_buffer_free (player->external_actions); g_assert (swfdec_ring_buffer_pop (player->actions) == NULL...

...ie=0xb8d1030) at swfdec_movie.c:262 #23 0xb04aed57 in swfdec_movie_remove (movie=0xb8d1030) at swfdec_movie.c:292 #24 0xb04aeb30 in swfdec_movie_do_remove (movie=0xb55ebc0) at swfdec_movie.c:262 #25 0xb04aeca3 in swfdec_movie_destroy (movie=0xb55ebc0) at swfdec_movie.c:314 #26 0xb04bd34c in swfdec_player_dispose (object=0xa35cf00) at swfdec_player.c:848 #27 0xb20209c6 in swfdec_gtk_player_dispose (object=0xa35cf00) at swfdec_gtk_player.c:129 #28 0xb763a85c in g_object_unref () from /usr/lib/libgobject-2.0.so.0 #29 0xb0686008 in swfmoz_player_dispose (object=0xb09c850) at swfmoz_player.c:339 #30...

...n (SwfdecPlayer *player, gpointer object, void swfdec_player_remove_all_external_actions (SwfdecPlayer *player, gpointer object) { - SwfdecPlayerAction *action; + SwfdecPlayerExternalAction *action; guint i; g_return_if_fail (SWFDEC_IS_PLAYER (player)); @@ -768,6 +809,7 @@ static void swfdec_player_dispose (GObject *object) { SwfdecPlayer *player = SWFDEC_PLAYER (object); + guint i; swfdec_player_stop_all_sounds (player); g_hash_table_destroy (player->registered_classes); @@ -785,17 +827,24 @@ swfdec_player_dispose (GObject *object) swfdec_player_remove_all_external_actions (player...

...ayer->system = swfdec_system_new (); } break; + case PROP_MAX_RUNTIME: + swfdec_player_set_maximum_runtime (player, g_value_get_ulong (value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); break; @@ -811,6 +818,10 @@ swfdec_player_dispose (GObject *object) } g_array_free (player->invalidations, TRUE); player->invalidations = NULL; + if (player->runtime) { + g_timer_destroy (player->runtime); + player->runtime = NULL; + } } static void @@ -1289,6 +1300,16 @@ swfdec_player_get_time (SwfdecAsContext...

..._CONSTANT_STRING ("Stage") + SWFDEC_AS_CONSTANT_STRING ("onResize") /* add more here */ ; diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 398db18..cf0f01c 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -586,22 +586,19 @@ swfdec_player_dispose (GObject *object) } static void -swfdec_player_dispatch_properties_changed (GObject *object, guint n_pspecs, - GParamSpec **pspecs) +swfdec_player_broadcast (SwfdecPlayer *player, const char *object_name, const char *signal) { - guint i; + SwfdecAsValue val; + SwfdecAsObject *obj; -...

...or: Benjamin Otte <otte at gnome.org> Date: Wed Aug 1 16:34:36 2007 +0200 remove hack for loader actions diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index b4df554..ab9d34a 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -633,8 +633,6 @@ swfdec_player_dispose (GObject *object) while (player->roots) swfdec_movie_destroy (player->roots->data); - swfdec_player_remove_all_actions (player, player); /* HACK to allow non-removable actions */ - /* we do this here so references to GC'd objects get freed */ G_OBJECT_CLASS (swfdec_pla...

...esource, SWFDEC_SPRITE_MOVIE (movie)); + resource->movie = SWFDEC_SPRITE_MOVIE (movie); } return movie; } diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 3d36451..4d7e723 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -887,7 +887,8 @@ swfdec_player_dispose (GObject *object) } g_assert (player->timeouts == NULL); g_list_free (player->intervals); - g_list_free (player->load_objects); + while (player->rooted_objects) + swfdec_player_unroot_object (player, player->rooted_objects->data); player->intervals = NULL; s...

...if (klass->init_movie) klass->init_movie (movie); swfdec_movie_queue_script (movie, SWFDEC_EVENT_LOAD); diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 285eae9..fd528fa 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -378,8 +378,8 @@ swfdec_player_dispose (GObject *object) g_hash_table_foreach_steal (player->registered_classes, free_registered_class, player); g_hash_table_destroy (player->registered_classes); - g_list_foreach (player->roots, (GFunc) swfdec_movie_destroy, NULL); - g_list_free (player->roots); + while (player-&g...

...e <otte at gnome.org> Date: Mon Nov 12 23:16:32 2007 +0100 free objects before checking they're gone diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index ea6cb4b..dc44de2 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -850,6 +850,8 @@ swfdec_player_dispose (GObject *object) g_object_unref (player->resource); player->resource = NULL; } + while (player->rooted_objects) + swfdec_player_unroot_object (player, player->rooted_objects->data); /* we do this here so references to GC'd objects get freed */ G_OBJECT_C...

...e at gnome.org> Date: Thu Aug 2 16:55:26 2007 +0200 use proper assertion check to make sure list is empty diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index f231a4a..7c73932 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -641,18 +641,19 @@ swfdec_player_dispose (GObject *object) /* we do this here so references to GC'd objects get freed */ G_OBJECT_CLASS (swfdec_player_parent_class)->dispose (object); + swfdec_player_remove_all_external_actions (player, player); #ifndef G_DISABLE_ASSERT { SwfdecPlayerAction *action; + while ((a...

...AsValue * args); +void swfdec_interval_remove (SwfdecPlayer * player, + guint id); + + +G_END_DECLS +#endif diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 965f021..54a2707 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -397,6 +397,8 @@ swfdec_player_dispose (GObject *object) swfdec_player_remove_timeout (player, &player->iterate_timeout); } g_assert (player->timeouts == NULL); + g_list_free (player->intervals); + player->intervals = NULL; g_assert (g_queue_is_empty (player->init_queue)); g_assert (g_queue_is_empty...

...s->dispose = swfdec_load_object_dispose; + + as_object_class->mark = swfdec_load_object_mark; } static void diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 942dadf..b1ad1c7 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -666,6 +666,7 @@ swfdec_player_dispose (GObject *object) } g_assert (player->timeouts == NULL); g_list_free (player->intervals); + g_list_free (player->load_objects); player->intervals = NULL; g_assert (g_queue_is_empty (player->init_queue)); g_assert (g_queue_is_empty (player->construct_queue)); @@...

...m = SWFDEC_SYSTEM (g_value_dup_object (value)); + priv->system = SWFDEC_SYSTEM (g_value_dup_object (value)); } else { - player->system = swfdec_system_new (); + priv->system = swfdec_system_new (); } break; case PROP_MAX_RUNTIME: @@ -834,20 +855,21 @@ static void swfdec_player_dispose (GObject *object) { SwfdecPlayer *player = SWFDEC_PLAYER (object); + SwfdecPlayerPrivate *priv = player->priv; guint i; swfdec_player_stop_all_sounds (player); swfdec_player_resource_request_finish (player); - g_hash_table_destroy (player->registered_classes); + g_hash_table...

...t; +#include "swfdec_resource.h" +#include "swfdec_resource_request.h" #include "swfdec_script_internal.h" #include "swfdec_sprite_movie.h" -#include "swfdec_resource.h" #include "swfdec_utils.h" /*** gtk-doc ***/ @@ -836,6 +837,7 @@ swfdec_player_dispose (GObject *object) guint i; swfdec_player_stop_all_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_...

...Fri Mar 2 22:47:25 2007 +0100 Add a hack to allow adding actions that get executed "no matter what" diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 6de320b..81d06fa 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -358,6 +358,7 @@ swfdec_player_dispose (GObject *object) swfdec_js_finish_player (player); + swfdec_player_remove_all_actions (player, player); /* HACK to allow non-removable actions */ g_assert (swfdec_ring_buffer_pop (player->actions) == NULL); swfdec_ring_buffer_free (player->actions); g_assert (player->movi...

...26 @@ swfdec_player_set_property (GObject *obj } } +static gboolean +free_registered_class (gpointer key, gpointer value, gpointer playerp) +{ + SwfdecPlayer *player = playerp; + + g_free (key); + JS_RemoveRoot (player->jscx, value); + g_free (value); + return TRUE; +} + static void swfdec_player_dispose (GObject *object) { SwfdecPlayer *player = SWFDEC_PLAYER (object); swfdec_player_stop_all_sounds (player); + /* this must happen before we finish the JS player, we have roots in there */ + g_hash_table_foreach_steal (player->registered_classes, free_registered_class, player); + g_has...

...if (g_value_get_object (value)) { + player->system = SWFDEC_SYSTEM (g_value_dup_object (value)); + } else { + player->system = swfdec_system_new (); + } + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); break; @@ -789,6 +801,10 @@ swfdec_player_dispose (GObject *object) g_object_unref (player->loader); player->loader = NULL; } + if (player->system) { + g_object_unref (player->system); + player->system = NULL; + } } static void @@ -1304,6 +1320,9 @@ swfdec_player_class_init (SwfdecPlayerCl g_object_class_...