From: Thibault Saunier <tsaunier@gnome.org>
Date: Thu, 23 Jul 2015 09:40:57 +0000 (+0200)
Subject: ges: Fix how we handle layer vs layer-priority in the structured interface
X-Git-Tag: 1.19.3~493^2~1151
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=254c2b1f5ed98fbd5c69d9e0c7da75dfc5176999;p=platform%2Fupstream%2Fgstreamer.git

ges: Fix how we handle layer vs layer-priority in the structured interface
---

diff --git a/ges/ges-structured-interface.c b/ges/ges-structured-interface.c
index b54a921..11ff2bc 100644
--- a/ges/ges-structured-interface.c
+++ b/ges/ges-structured-interface.c
@@ -346,7 +346,8 @@ _ges_add_clip_from_struct (GESTimeline * timeline, GstStructure * structure,
   TRY_GET ("pattern", G_TYPE_STRING, &pattern, NULL);
   TRY_GET ("name", G_TYPE_STRING, &name, NULL);
   TRY_GET ("layer-priority", G_TYPE_INT, &layer_priority, -1);
-  TRY_GET ("layer", G_TYPE_INT, &layer_priority, -1);
+  if (layer_priority == -1)
+    TRY_GET ("layer", G_TYPE_INT, &layer_priority, -1);
   TRY_GET ("type", G_TYPE_STRING, &type_string, "GESUriClip");
   TRY_GET ("start", GST_TYPE_CLOCK_TIME, &start, GST_CLOCK_TIME_NONE);
   TRY_GET ("inpoint", GST_TYPE_CLOCK_TIME, &inpoint, 0);