mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-04 13:45:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

ges: Fix setting GError when adding children to containers

Browse source 
We were misusing assertion and not properly setting the GError value
This commit is contained in:
Thibault Saunier 2019-10-22 11:50:02 +02:00
parent d58d992674
commit 64bb85e6a1
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -552,7 +552,14 @@ _ges_container_add_child_from_struct (GESTimeline * timeline,
GES_CONTAINER (ges_timeline_get_element (timeline, container_name)); GES_CONTAINER (ges_timeline_get_element (timeline, container_name));
} }
g_return_val_if_fail (GES_IS_CONTAINER (container), FALSE); if (!GES_IS_CONTAINER (container)) {
*error =
g_error_new (GES_ERROR, 0, "Could not find container: %s (%p)",
container_name, container);
res = FALSE;
goto beach;
}
id = gst_structure_get_string (structure, "asset-id"); id = gst_structure_get_string (structure, "asset-id");
child_type = gst_structure_get_string (structure, "child-type"); child_type = gst_structure_get_string (structure, "child-type");
@ -569,7 +576,7 @@ _ges_container_add_child_from_struct (GESTimeline * timeline,
child = GES_TIMELINE_ELEMENT (ges_asset_extract (asset, NULL)); child = GES_TIMELINE_ELEMENT (ges_asset_extract (asset, NULL));
if (!GES_IS_TIMELINE_ELEMENT (child)) { if (!GES_IS_TIMELINE_ELEMENT (child)) {
g_error_new (GES_ERROR, 0, "Could not extract child element"); *error = g_error_new (GES_ERROR, 0, "Could not extract child element");
goto beach; goto beach;
} }
@ -579,14 +586,15 @@ _ges_container_add_child_from_struct (GESTimeline * timeline,
if (!child && child_name) { if (!child && child_name) {
child = ges_timeline_get_element (timeline, child_name); child = ges_timeline_get_element (timeline, child_name);
if (!GES_IS_TIMELINE_ELEMENT (child)) { if (!GES_IS_TIMELINE_ELEMENT (child)) {
g_error_new (GES_ERROR, 0, "Could not find child element"); *error = g_error_new (GES_ERROR, 0, "Could not find child element");
goto beach; goto beach;
} }
} }
if (!child) { if (!child) {
g_error_new (GES_ERROR, 0, "Wrong parameters, could not get a child"); *error =
g_error_new (GES_ERROR, 0, "Wrong parameters, could not get a child");
return FALSE; return FALSE;
} }