gst-editing-services: ges: Misc fixes in ges-timeline-layer
Thibault Saunier
tsaunier at kemper.freedesktop.org
Wed Jan 11 07:04:33 PST 2012
Module: gst-editing-services
Branch: master
Commit: 82974d9a9ddc6cc3481d98ee49fcff80c3c0bcac
URL: http://cgit.freedesktop.org/gstreamer/gst-editing-services/commit/?id=82974d9a9ddc6cc3481d98ee49fcff80c3c0bcac
Author: Thibault Saunier <thibault.saunier at collabora.com>
Date: Wed Nov 30 21:46:21 2011 -0300
ges: Misc fixes in ges-timeline-layer
Put the comment where they are meant to be
Make static functions static
Use LAYER_HEIGHT where needed
---
ges/ges-timeline-layer.c | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/ges/ges-timeline-layer.c b/ges/ges-timeline-layer.c
index 16470c3..cb4fa1b 100644
--- a/ges/ges-timeline-layer.c
+++ b/ges/ges-timeline-layer.c
@@ -207,7 +207,7 @@ ges_timeline_layer_init (GESTimelineLayer * self)
self->priv->priority = 0;
self->priv->auto_transition = FALSE;
self->min_gnl_priority = 0;
- self->max_gnl_priority = 9;
+ self->max_gnl_priority = LAYER_HEIGHT;
}
/**
@@ -249,20 +249,6 @@ objects_start_compare (GESTimelineObject * a, GESTimelineObject * b)
return 0;
}
-/**
- * ges_timeline_layer_add_object:
- * @layer: a #GESTimelineLayer
- * @object: (transfer full): the #GESTimelineObject to add.
- *
- * Adds the given object to the layer. Sets the object's parent, and thus
- * takes ownership of the object.
- *
- * An object can only be added to one layer.
- *
- * Returns: TRUE if the object was properly added to the layer, or FALSE
- * if the @layer refuses to add the object.
- */
-
static GList *
track_get_by_layer (GESTimelineLayer * layer, GESTrack * track)
{
@@ -285,6 +271,19 @@ track_get_by_layer (GESTimelineLayer * layer, GESTrack * track)
return return_list;
}
+/**
+ * ges_timeline_layer_add_object:
+ * @layer: a #GESTimelineLayer
+ * @object: (transfer full): the #GESTimelineObject to add.
+ *
+ * Adds the given object to the layer. Sets the object's parent, and thus
+ * takes ownership of the object.
+ *
+ * An object can only be added to one layer.
+ *
+ * Returns: TRUE if the object was properly added to the layer, or FALSE
+ * if the @layer refuses to add the object.
+ */
gboolean
ges_timeline_layer_add_object (GESTimelineLayer * layer,
GESTimelineObject * object)
More information about the gstreamer-commits
mailing list