gst-editing-services: ges: Bump layer height from 10 to 1000

Thibault Saunier tsaunier at kemper.freedesktop.org
Wed Jan 11 07:04:34 PST 2012


Module: gst-editing-services
Branch: master
Commit: 826d4f9a71ead9bdd3d48e4b3de80ba733878196
URL:    http://cgit.freedesktop.org/gstreamer/gst-editing-services/commit/?id=826d4f9a71ead9bdd3d48e4b3de80ba733878196

Author: Thibault Saunier <thibault.saunier at collabora.com>
Date:   Fri Jun 17 14:29:52 2011 -0400

ges: Bump layer height from 10 to 1000

---

 ges/ges-timeline-layer.c |    2 +-
 tests/check/ges/layer.c  |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ges/ges-timeline-layer.c b/ges/ges-timeline-layer.c
index 4e635d5..8af8c77 100644
--- a/ges/ges-timeline-layer.c
+++ b/ges/ges-timeline-layer.c
@@ -34,7 +34,7 @@
 #include "ges.h"
 #include "ges-timeline-source.h"
 
-#define LAYER_HEIGHT 10
+#define LAYER_HEIGHT 1000
 
 static void
 track_object_removed_cb (GESTimelineObject * object,
diff --git a/tests/check/ges/layer.c b/tests/check/ges/layer.c
index e23e74c..51f969a 100644
--- a/tests/check/ges/layer.c
+++ b/tests/check/ges/layer.c
@@ -20,7 +20,7 @@
 #include <ges/ges.h>
 #include <gst/check/gstcheck.h>
 
-#define LAYER_HEIGHT 10
+#define LAYER_HEIGHT 1000
 
 static gboolean
 my_fill_track_func (GESTimelineObject * object,
@@ -120,14 +120,14 @@ GST_START_TEST (test_layer_properties)
   assert_equals_int (ges_timeline_layer_get_priority (layer), 1);
   assert_equals_uint64 (GES_TIMELINE_OBJECT_PRIORITY (object), 0);
   gnl_object_check (ges_track_object_get_gnlobject (trackobject), 42, 51, 12,
-      51, 10, TRUE);
+      51, LAYER_HEIGHT, TRUE);
 
   /* Change it to an insanely high value */
-  g_object_set (layer, "priority", 1000000, NULL);
-  assert_equals_int (ges_timeline_layer_get_priority (layer), 1000000);
+  g_object_set (layer, "priority", 31, NULL);
+  assert_equals_int (ges_timeline_layer_get_priority (layer), 31);
   assert_equals_uint64 (GES_TIMELINE_OBJECT_PRIORITY (object), 0);
   gnl_object_check (ges_track_object_get_gnlobject (trackobject), 42, 51, 12,
-      51, 10000000, TRUE);
+      51, LAYER_HEIGHT * 31, TRUE);
 
   /* and back to 0 */
   g_object_set (layer, "priority", 0, NULL);



More information about the gstreamer-commits mailing list