mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

ges: Accept path as URI in the create clip structured interface

Browse source
This commit is contained in:
Thibault Saunier 2015-03-01 13:10:55 +01:00
parent 7efa8c86a9
commit 20d94bea13
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ges/ges-structured-interface.c
View file

@ -245,6 +245,14 @@ done:
} \ } \
} G_STMT_END } G_STMT_END
static gchar *
ensure_uri (gchar * location)
{
if (gst_uri_is_valid (location))
return g_strdup (location);
else
return gst_filename_to_uri (location, NULL);
}
gboolean gboolean
_ges_add_clip_from_struct (GESTimeline * timeline, GstStructure * structure, _ges_add_clip_from_struct (GESTimeline * timeline, GstStructure * structure,
@ -255,7 +263,7 @@ _ges_add_clip_from_struct (GESTimeline * timeline, GstStructure * structure,
GESClip *clip; GESClip *clip;
gint layer_priority; gint layer_priority;
const gchar *name; const gchar *name;
const gchar *asset_id; gchar *asset_id = NULL;
const gchar *type_string; const gchar *type_string;
GType type; GType type;
gboolean res = FALSE; gboolean res = FALSE;
@ -290,6 +298,12 @@ _ges_add_clip_from_struct (GESTimeline * timeline, GstStructure * structure,
goto beach; goto beach;
} }
if (type == GES_TYPE_URI_CLIP) {
asset_id = ensure_uri (asset_id);
} else {
asset_id = g_strdup (asset_id);
}
asset = _ges_get_asset_from_timeline (timeline, type, asset_id, error); asset = _ges_get_asset_from_timeline (timeline, type, asset_id, error);
if (!asset) { if (!asset) {
res = FALSE; res = FALSE;
@ -339,6 +353,7 @@ _ges_add_clip_from_struct (GESTimeline * timeline, GstStructure * structure,
gst_object_unref (layer); gst_object_unref (layer);
beach: beach:
g_free (asset_id);
return res; return res;
} }