ges: Bump layer height from 10 to 1000
authorThibault Saunier <thibault.saunier@collabora.com>
Fri, 17 Jun 2011 18:29:52 +0000 (14:29 -0400)
committerThibault Saunier <thibault.saunier@collabora.com>
Wed, 11 Jan 2012 14:56:16 +0000 (11:56 -0300)
ges/ges-timeline-layer.c
tests/check/ges/layer.c

index 4e635d52e7c0755483edae46815b4da813f06630..8af8c77c5baf26dfc5d3b8fd298ced830cbb8a6e 100644 (file)
@@ -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,
index e23e74ccefbad378e79b1e5ae5b3818ef9f21d7f..51f969af1a18ecd80072ea3808ede841d3b1c4fa 100644 (file)
@@ -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);