mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

project: Track Asset that were loaded with error

Browse source
This commit is contained in:
Thibault Saunier 2013-01-11 19:07:22 -03:00
parent 1d397591af
commit e071e3ed37
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ges/ges-project.c
View file

@ -56,6 +56,7 @@ struct _GESProjectPrivate
GHashTable *assets; GHashTable *assets;
/* Set of asset ID being loaded */ /* Set of asset ID being loaded */
GHashTable *loading_assets; GHashTable *loading_assets;
GHashTable *loaded_with_error;
GESAsset *formatter_asset; GESAsset *formatter_asset;
GList *formatters; GList *formatters;
@ -252,6 +253,8 @@ _dispose (GObject * object)
g_hash_table_unref (priv->assets); g_hash_table_unref (priv->assets);
if (priv->loading_assets) if (priv->loading_assets)
g_hash_table_unref (priv->loading_assets); g_hash_table_unref (priv->loading_assets);
if (priv->loaded_with_error)
g_hash_table_unref (priv->loaded_with_error);
if (priv->formatter_asset) if (priv->formatter_asset)
gst_object_unref (priv->formatter_asset); gst_object_unref (priv->formatter_asset);
@ -425,6 +428,8 @@ ges_project_init (GESProject * project)
g_free, gst_object_unref); g_free, gst_object_unref);
priv->loading_assets = g_hash_table_new_full (g_str_hash, g_str_equal, priv->loading_assets = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, gst_object_unref); g_free, gst_object_unref);
priv->loaded_with_error = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, NULL);
} }
gchar * gchar *
@ -471,6 +476,7 @@ new_asset_cb (GESAsset * source, GAsyncResult * res, GESProject * project)
possible_id = ges_project_try_updating_id (project, source, error); possible_id = ges_project_try_updating_id (project, source, error);
if (possible_id == NULL) { if (possible_id == NULL) {
g_hash_table_remove (project->priv->loading_assets, id); g_hash_table_remove (project->priv->loading_assets, id);
g_hash_table_add (project->priv->loaded_with_error, g_strdup (id));
g_signal_emit (project, _signals[ERROR_LOADING_ASSET], 0, error, id, g_signal_emit (project, _signals[ERROR_LOADING_ASSET], 0, error, id,
ges_asset_get_extractable_type (source)); ges_asset_get_extractable_type (source));
@ -548,7 +554,8 @@ ges_project_create_asset (GESProject * project, const gchar * id,
FALSE); FALSE);
if (g_hash_table_lookup (project->priv->assets, id) || if (g_hash_table_lookup (project->priv->assets, id) ||
g_hash_table_lookup (project->priv->loading_assets, id)) g_hash_table_lookup (project->priv->loading_assets, id) ||
g_hash_table_lookup (project->priv->loaded_with_error, id))
return FALSE; return FALSE;
/* TODO Add a GCancellable somewhere in our API */ /* TODO Add a GCancellable somewhere in our API */

3
tests/check/ges/project.c
View file

@ -147,9 +147,8 @@ GST_START_TEST (test_project_unexistant_effect)
g_main_loop_run (mainloop); g_main_loop_run (mainloop);
/* And.... try again! */ /* And.... try again! */
fail_unless (ges_project_create_asset (project, "nowaythiselementexists", fail_if (ges_project_create_asset (project, "nowaythiselementexists",
GES_TYPE_TRACK_PARSE_LAUNCH_EFFECT)); GES_TYPE_TRACK_PARSE_LAUNCH_EFFECT));
g_main_loop_run (mainloop);
fail_if (added_cb_called); fail_if (added_cb_called);
fail_if (removed_cb_called); fail_if (removed_cb_called);