From a69106ce536ae3023770b10701269708ffddc90d Mon Sep 17 00:00:00 2001
From: Thibault Saunier <thibault.saunier@collabora.co.uk>
Date: Wed, 16 Feb 2011 17:51:21 +0100
Subject: [PATCH] GESTimelineObject: set_top_effect_priority refactoring

---
 ges/ges-timeline-object.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/ges/ges-timeline-object.c b/ges/ges-timeline-object.c
index fd7fdec290..08e3b5a762 100644
--- a/ges/ges-timeline-object.c
+++ b/ges/ges-timeline-object.c
@@ -909,16 +909,27 @@ ges_timeline_object_set_top_effect_priority (GESTimelineObject * object,
     GESTrackEffect * effect, guint newpriority)
 {
   GList *tmp;
-  guint inc;
+  gint inc;
   GESTrackObject *tck_obj = GES_TRACK_OBJECT (effect);
   GESTimelineObjectPrivate *priv = object->priv;
 
+  guint current_prio = ges_track_object_get_priority (tck_obj);
   /*  We don't change the priority */
-  if (tck_obj->priority == newpriority ||
-      (newpriority > (object->priv->nb_effects - 1)) ||
-      (G_UNLIKELY (ges_track_object_get_timeline_object (tck_obj) != object))) {
+  if (current_prio == newpriority ||
+      (G_UNLIKELY (ges_track_object_get_timeline_object (tck_obj) != object)))
     return FALSE;
-  } else if (tck_obj->priority < newpriority)
+
+  if (newpriority > (object->priv->nb_effects - 1)) {
+    GST_DEBUG ("You are trying to make %p not a top effect", effect);
+    return FALSE;
+  }
+
+  if (current_prio > object->priv->nb_effects) {
+    GST_DEBUG ("%p is not a top effect");
+    return FALSE;
+  }
+
+  if (tck_obj->priority < newpriority)
     inc = -1;
   else
     inc = +1;