mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 19:51:11 +00:00
ges: Fix some error settings
Summary: Depends on D176 Reviewers: Mathieu_Du Differential Revision: http://phabricator.freedesktop.org/D177
This commit is contained in:
parent
2ddab4db57
commit
9843ffeed2
2 changed files with 13 additions and 2 deletions
|
@ -232,6 +232,13 @@ _ges_get_asset_from_timeline (GESTimeline * timeline, GType type,
|
|||
if (err)
|
||||
g_propagate_error (error, err);
|
||||
if (!asset || (error && *error)) {
|
||||
|
||||
if (error && !*error) {
|
||||
*error = g_error_new (GES_ERROR, 0,
|
||||
"There was an error requesting the asset with id %s and type %s (%s)",
|
||||
id, g_type_name (type), error ? (*error)->message : "unknown");
|
||||
}
|
||||
|
||||
GST_ERROR
|
||||
("There was an error requesting the asset with id %s and type %s (%s)",
|
||||
id, g_type_name (type), error ? (*error)->message : "unknown");
|
||||
|
@ -356,7 +363,8 @@ _ges_add_clip_from_struct (GESTimeline * timeline, GstStructure * structure,
|
|||
}
|
||||
|
||||
if (!layer) {
|
||||
g_error_new (GES_ERROR, 0, "No layer with priority %d", layer_priority);
|
||||
*error =
|
||||
g_error_new (GES_ERROR, 0, "No layer with priority %d", layer_priority);
|
||||
goto beach;
|
||||
}
|
||||
|
||||
|
|
|
@ -545,7 +545,10 @@ _validate_action_execute (GstValidateScenario * scenario,
|
|||
|
||||
if (!func (timeline, action->structure, &err)) {
|
||||
GST_VALIDATE_REPORT (scenario,
|
||||
g_quark_from_string ("scenario::execution-error"), err->message);
|
||||
g_quark_from_string ("scenario::execution-error"),
|
||||
"Could not execute %s (error: %s)",
|
||||
gst_structure_get_name (action->structure),
|
||||
err ? err->message : "None");
|
||||
|
||||
g_clear_error (&err);
|
||||
|
||||
|
|
Loading…
Reference in a new issue