#define LAYER_HEIGHT 1000
static void
-track_object_removed_cb (GESTimelineObject * object,
- GESTrackObject * track_object);
-static void track_object_added_cb (GESTimelineObject * object,
- GESTrackObject * track_object, GHashTable * signal_table);
-static void track_object_changed_cb (GESTrackObject * track_object,
- GParamSpec * arg G_GNUC_UNUSED);
-static void calculate_transitions (GESTrackObject * track_object);
-static void calculate_next_transition (GESTrackObject * track_object,
- GESTimelineLayer * layer);
-
-static void
timeline_object_height_changed_cb (GESTimelineObject * obj,
GESTrackEffect * tr_eff, GESTimelineObject * second_obj);
GList *objects_start; /* The TimelineObjects sorted by start and
* priority */
- guint32 priority; /* The priority of the layer within the
+ guint32 priority; /* The priority of the layer within the
* containing timeline */
-
gboolean auto_transition;
-
-
- GHashTable *signal_table;
};
enum
static guint ges_timeline_layer_signals[LAST_SIGNAL] = { 0 };
-static gboolean ges_timeline_layer_resync_priorities (GESTimelineLayer * layer);
-
-static GList *track_get_by_layer (GESTimelineLayer * layer, GESTrack * track);
-
-static void compare (GList * compared, GESTrackObject * track_object,
- gboolean ahead);
-
+/* GObject standard vmethods */
static void
ges_timeline_layer_get_property (GObject * object, guint property_id,
GValue * value, GParamSpec * pspec)
self->priv->auto_transition = FALSE;
self->min_gnl_priority = 0;
self->max_gnl_priority = LAYER_HEIGHT;
- self->priv->signal_table =
- g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref,
- NULL);
-}
-
-/**
- * ges_timeline_layer_new:
- *
- * Creates a new #GESTimelineLayer.
- *
- * Returns: A new #GESTimelineLayer
- */
-GESTimelineLayer *
-ges_timeline_layer_new (void)
-{
- return g_object_new (GES_TYPE_TIMELINE_LAYER, NULL);
-}
-
-/**
- * ges_timeline_layer_get_timeline:
- * @layer: The #GESTimelineLayer to get the parent #GESTimeline from
- *
- * Get the #GESTimeline in which #GESTimelineLayer currently is.
- *
- * Returns: (transfer none): the #GESTimeline in which #GESTimelineLayer
- * currently is or %NULL if not in any timeline yet.
- */
-GESTimeline *
-ges_timeline_layer_get_timeline (GESTimelineLayer * layer)
-{
- g_return_val_if_fail (GES_IS_TIMELINE_LAYER (layer), NULL);
-
- return layer->timeline;
-}
-
-void
-ges_timeline_layer_set_timeline (GESTimelineLayer * layer,
- GESTimeline * timeline)
-{
- GST_DEBUG ("layer:%p, timeline:%p", layer, timeline);
-
- layer->timeline = timeline;
}
+/* Private methods and utils */
static gint
objects_start_compare (GESTimelineObject * a, GESTimelineObject * b)
{
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)
+/* Compare:
+ * @compared: The #GList of #GESTrackObjects that we compare with @track_object
+ * @track_object: The #GESTrackObject that serves as a reference
+ * @ahead: %TRUE if we are comparing frontward %FALSE if we are comparing
+ * backward*/
+static void
+compare (GList * compared, GESTrackObject * track_object, gboolean ahead)
{
- GESTimelineLayer *tl_obj_layer;
- guint32 maxprio, minprio, prio;
+ GList *tmp;
+ gint64 start, duration, compared_start, compared_duration, end, compared_end,
+ tr_start, tr_duration;
+ GESTimelineStandardTransition *trans = NULL;
+ GESTrack *track;
+ GESTimelineLayer *layer;
+ GESTimelineObject *object, *compared_object, *first_object, *second_object;
+ gint priority;
- GST_DEBUG ("layer:%p, object:%p", layer, object);
+ g_return_if_fail (compared);
- tl_obj_layer = ges_timeline_object_get_layer (object);
+ GST_DEBUG ("Recalculating transitions");
- if (G_UNLIKELY (tl_obj_layer)) {
- GST_WARNING ("TimelineObject %p already belongs to another layer", object);
- g_object_unref (tl_obj_layer);
- return FALSE;
+ object = ges_track_object_get_timeline_object (track_object);
+
+ if (!object) {
+ GST_WARNING ("Trackobject not in a timeline object: "
+ "Can not calulate transitions");
+
+ return;
}
- g_object_ref_sink (object);
+ compared_object = ges_track_object_get_timeline_object (compared->data);
+ layer = ges_timeline_object_get_layer (object);
- /* Take a reference to the object and store it stored by start/priority */
- layer->priv->objects_start =
- g_list_insert_sorted (layer->priv->objects_start, object,
- (GCompareFunc) objects_start_compare);
+ start = ges_track_object_get_start (track_object);
+ duration = ges_track_object_get_duration (track_object);
+ compared_start = ges_track_object_get_start (compared->data);
+ compared_duration = ges_track_object_get_duration (compared->data);
+ end = start + duration;
+ compared_end = compared_start + compared_duration;
- /* We have to wait for the track objects to be created to calculate transitions */
- if (layer->priv->auto_transition) {
- if (GES_IS_TIMELINE_SOURCE (object)) {
- g_signal_connect (G_OBJECT (object), "track-object-added",
- G_CALLBACK (track_object_added_cb), layer->priv->signal_table);
- g_signal_connect (G_OBJECT (object), "track-object-removed",
- G_CALLBACK (track_object_removed_cb), NULL);
+ if (ahead) {
+ /* Make sure we remove the last transition we created it is not needed
+ * FIXME make it a smarter way */
+ if (compared->prev && GES_IS_TRACK_TRANSITION (compared->prev->data)) {
+ trans = GES_TIMELINE_STANDARD_TRANSITION
+ (ges_track_object_get_timeline_object (compared->prev->data));
+ g_object_get (compared->prev->data, "start", &tr_start, "duration",
+ &tr_duration, NULL);
+ if (tr_start >= compared_start && tr_start + tr_duration <= compared_end)
+ ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
+ trans = NULL;
}
- }
- /* Inform the object it's now in this layer */
- ges_timeline_object_set_layer (object, layer);
+ for (tmp = compared->next; tmp; tmp = tmp->next) {
+ /* If we have a transitionmnmnm we recaluculuculate its values */
+ if (GES_IS_TRACK_TRANSITION (tmp->data)) {
+ g_object_get (tmp->data, "start", &tr_start, "duration", &tr_duration,
+ NULL);
- GST_DEBUG ("current object priority : %d, layer min/max : %d/%d",
- GES_TIMELINE_OBJECT_PRIORITY (object),
- layer->min_gnl_priority, layer->max_gnl_priority);
+ if (tr_start + tr_duration == compared_start + compared_duration) {
+ GESTimelineObject *tlobj;
+ tlobj = ges_track_object_get_timeline_object (tmp->data);
- /* Set the priority. */
- maxprio = layer->max_gnl_priority;
- minprio = layer->min_gnl_priority;
- prio = GES_TIMELINE_OBJECT_PRIORITY (object);
- if (minprio + prio > (maxprio)) {
- GST_WARNING ("%p is out of the layer %p space, setting its priority to "
- "setting its priority %d to failthe maximum priority of the layer %d",
- object, layer, prio, maxprio - minprio);
- ges_timeline_object_set_priority (object, LAYER_HEIGHT - 1);
- }
- /* If the object has an acceptable priority, we just let it with its current
- * priority */
+ trans = GES_TIMELINE_STANDARD_TRANSITION (tlobj);
+ break;
+ }
+ }
+ }
- ges_timeline_layer_resync_priorities (layer);
+ if (compared_end <= start) {
+ if (trans) {
+ ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
+ g_object_get (compared_object, "priority", &priority, NULL);
+ g_object_set (object, "priority", priority, NULL);
+ }
- /* emit 'object-added' */
- g_signal_emit (layer, ges_timeline_layer_signals[OBJECT_ADDED], 0, object);
+ goto clean;
+ } else if (start > compared_start && end < compared_end) {
+ if (trans) {
+ /* Transition not needed anymore */
+ ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
+ }
+ goto clean;
+ } else if (start <= compared_start) {
+ if (trans) {
+ ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
+ }
- return TRUE;
-}
+ goto clean;
+ }
-static void
-track_object_duration_cb (GESTrackObject * track_object,
- GParamSpec * arg G_GNUC_UNUSED)
-{
- GESTimelineLayer *layer;
- GESTimelineObject *tlobj;
+ } else {
+ if (compared->next && GES_IS_TRACK_TRANSITION (compared->next->data)) {
+ trans = GES_TIMELINE_STANDARD_TRANSITION
+ (ges_track_object_get_timeline_object (compared->next->data));
+ g_object_get (compared->prev->data, "start", &tr_start, "duration",
+ &tr_duration, NULL);
+ if (tr_start >= compared_start && tr_start + tr_duration <= compared_end)
+ ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
+ trans = NULL;
+ }
+ for (tmp = compared->prev; tmp; tmp = tmp->prev) {
+ if GES_IS_TRACK_TRANSITION
+ (tmp->data) {
+ g_object_get (tmp->data, "start", &tr_start, "duration", &tr_duration,
+ NULL);
+ if (tr_start == compared_start) {
+ trans = GES_TIMELINE_STANDARD_TRANSITION
+ (ges_track_object_get_timeline_object (tmp->data));
+ break;
+ }
+ }
+ }
- tlobj = ges_track_object_get_timeline_object (track_object);
- layer = ges_timeline_object_get_layer (tlobj);
- if (G_LIKELY (GES_IS_TRACK_SOURCE (track_object)))
- GST_DEBUG ("Here we should recalculate");
- calculate_next_transition (track_object, layer);
-}
+ if (start + duration <= compared_start) {
+ if (trans) {
+ ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
+ g_object_get (object, "priority", &priority, NULL);
+ g_object_set (compared_object, "priority", priority, NULL);
+ }
+ goto clean;
-static void
-track_object_deleted_cb (GESTrack * track, GESTrackObject * track_object)
-{
- GList *track_objects, *tmp, *cur;
- GESTimelineLayer *layer;
+ } else if (start > compared_start) {
+ if (trans)
+ ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
- track_objects = ges_track_get_objects (track);
- cur = g_list_find (track_objects, track_object);
- for (tmp = cur->next; tmp; tmp = tmp->next) {
- if (GES_IS_TRACK_SOURCE (tmp->data)) {
- break;
- }
- if (GES_IS_TRACK_AUDIO_TRANSITION (tmp->data)
- || GES_IS_TRACK_VIDEO_TRANSITION (tmp->data)) {
- layer =
- ges_timeline_object_get_layer (ges_track_object_get_timeline_object
- (tmp->data));
- if (ges_timeline_layer_get_auto_transition (layer)) {
- ges_track_enable_update (track, FALSE);
- ges_timeline_layer_remove_object (layer,
- ges_track_object_get_timeline_object (tmp->data));
- ges_track_enable_update (track, TRUE);
+ goto clean;
+ } else if (start < compared_start && end > compared_end) {
+ if (trans) {
+ ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
}
- g_object_unref (layer);
+
+ goto clean;
}
}
- for (tmp = cur->prev; tmp; tmp = tmp->prev) {
- if (GES_IS_TRACK_SOURCE (tmp->data)) {
- break;
- }
- if (GES_IS_TRACK_AUDIO_TRANSITION (tmp->data)
- || GES_IS_TRACK_VIDEO_TRANSITION (tmp->data)) {
- layer =
- ges_timeline_object_get_layer (ges_track_object_get_timeline_object
- (tmp->data));
- if (ges_timeline_layer_get_auto_transition (layer)) {
- ges_track_enable_update (track, FALSE);
- ges_timeline_layer_remove_object (layer,
- ges_track_object_get_timeline_object (tmp->data));
- ges_track_enable_update (track, TRUE);
- }
- g_object_unref (layer);
- }
- }
- g_object_unref (track_object);
-}
+ if (!trans) {
+ gint height;
-static void
-track_object_added_cb (GESTimelineObject * object,
- GESTrackObject * track_object, GHashTable * signal_table)
-{
- GESTrack *track;
- gint ptr;
+ trans =
+ ges_timeline_standard_transition_new_for_nick ((gchar *) "crossfade");
+ track = ges_track_object_get_track (track_object);
- if (GES_IS_TRACK_SOURCE (track_object)) {
- g_signal_connect (G_OBJECT (track_object), "notify::start",
- G_CALLBACK (track_object_changed_cb), NULL);
- g_signal_connect (G_OBJECT (track_object), "notify::duration",
- G_CALLBACK (track_object_duration_cb), NULL);
- calculate_transitions (track_object);
- }
- track = ges_track_object_get_track (track_object);
- if (!g_hash_table_lookup (signal_table, track)) {
- ptr = g_signal_connect (track, "track-object-removed",
- (GCallback) track_object_deleted_cb, NULL);
- g_hash_table_insert (signal_table, track, GINT_TO_POINTER (ptr));
- }
- return;
-}
+ ges_timeline_object_set_supported_formats (GES_TIMELINE_OBJECT (trans),
+ track->type);
-static void
-track_object_removed_cb (GESTimelineObject * object,
- GESTrackObject * track_object)
-{
- return;
- if (GES_IS_TRACK_SOURCE (track_object)) {
- g_signal_handlers_disconnect_by_func (track_object, track_object_changed_cb,
- object);
+ ges_timeline_layer_add_object (layer, GES_TIMELINE_OBJECT (trans));
+
+ if (ahead) {
+ first_object = ges_track_object_get_timeline_object (compared->data);
+ second_object = object;
+ } else {
+ second_object = ges_track_object_get_timeline_object (compared->data);
+ first_object = object;
+ }
+
+ g_object_get (first_object, "priority", &priority, "height", &height, NULL);
+ g_object_set (second_object, "priority", priority + height, NULL);
+ g_signal_connect (first_object, "notify::height",
+ (GCallback) timeline_object_height_changed_cb, second_object);
}
- return;
-}
-static void
-timeline_object_height_changed_cb (GESTimelineObject * obj,
- GESTrackEffect * tr_eff, GESTimelineObject * second_obj)
-{
- gint priority, height;
- g_object_get (obj, "height", &height, "priority", &priority, NULL);
- g_object_set (second_obj, "priority", priority + height, NULL);
-}
+ if (ahead) {
+ g_object_set (trans, "start", start, "duration",
+ compared_duration + compared_start - start, NULL);
+ } else {
+ g_object_set (trans, "start", compared_start, "duration",
+ start + duration - compared_start, NULL);
+ }
-static void
-track_object_changed_cb (GESTrackObject * track_object,
- GParamSpec * arg G_GNUC_UNUSED)
-{
- if (G_LIKELY (GES_IS_TRACK_SOURCE (track_object)))
- calculate_transitions (track_object);
+clean:
+ g_object_unref (layer);
}
static void
calculate_next_transition (GESTrackObject * track_object,
GESTimelineLayer * layer)
{
- GESTrack *track = ges_track_object_get_track (track_object);
- GList *tckobjs_in_layer = track_get_by_layer (layer, track);
+ GESTrack *track;
+ GList *tckobjs_in_layer;
- if (ges_track_object_get_track (track_object)) {
+ if ((track = ges_track_object_get_track (track_object))) {
+ tckobjs_in_layer = track_get_by_layer (layer, track);
calculate_next_transition_with_list (track_object, tckobjs_in_layer, layer);
- }
- g_list_foreach (tckobjs_in_layer, (GFunc) g_object_unref, NULL);
- g_list_free (tckobjs_in_layer);
+ g_list_foreach (tckobjs_in_layer, (GFunc) g_object_unref, NULL);
+ g_list_free (tckobjs_in_layer);
+ }
}
static void
calculate_transitions (GESTrackObject * track_object)
{
GList *tckobjs_in_layer, *compared;
- GESTrack *track = ges_track_object_get_track (track_object);
GESTimelineLayer *layer;
GESTimelineObject *tlobj;
+ GESTrack *track = ges_track_object_get_track (track_object);
+
+ if (track == NULL)
+ return;
+
tlobj = ges_track_object_get_timeline_object (track_object);
layer = ges_timeline_object_get_layer (tlobj);
tckobjs_in_layer = track_get_by_layer (layer, track);
}
-/* Compare:
- * @compared: The #GList of #GESTrackObjects that we compare with @track_object
- * @track_object: The #GESTrackObject that serves as a reference
- * @ahead: %TRUE if we are comparing frontward %FALSE if we are comparing
- * backward*/
static void
-compare (GList * compared, GESTrackObject * track_object, gboolean ahead)
+look_for_transition (GESTrackObject * track_object, GESTimelineLayer * layer)
{
- GList *tmp;
- gint64 start, duration, compared_start, compared_duration, end, compared_end,
- tr_start, tr_duration;
- GESTimelineStandardTransition *trans = NULL;
GESTrack *track;
- GESTimelineLayer *layer;
- GESTimelineObject *object, *compared_object, *first_object, *second_object;
- gint priority;
-
- g_return_if_fail (compared);
-
- GST_DEBUG ("Recalculating transitions");
-
- object = ges_track_object_get_timeline_object (track_object);
-
- if (!object) {
- GST_WARNING ("Trackobject not in a timeline object: "
- "Can not calulate transitions");
-
- return;
- }
-
- compared_object = ges_track_object_get_timeline_object (compared->data);
- layer = ges_timeline_object_get_layer (object);
-
- start = ges_track_object_get_start (track_object);
- duration = ges_track_object_get_duration (track_object);
- compared_start = ges_track_object_get_start (compared->data);
- compared_duration = ges_track_object_get_duration (compared->data);
- end = start + duration;
- compared_end = compared_start + compared_duration;
-
- if (ahead) {
- /* Make sure we remove the last transition we created it is not needed
- * FIXME make it a smarter way */
- if (compared->prev && GES_IS_TRACK_TRANSITION (compared->prev->data)) {
- trans = GES_TIMELINE_STANDARD_TRANSITION
- (ges_track_object_get_timeline_object (compared->prev->data));
- g_object_get (compared->prev->data, "start", &tr_start, "duration",
- &tr_duration, NULL);
- if (tr_start >= compared_start && tr_start + tr_duration <= compared_end)
- ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
- trans = NULL;
- }
+ GList *track_objects, *tmp, *cur;
- for (tmp = compared->next; tmp; tmp = tmp->next) {
- /* If we have a transitionmnmnm we recaluculuculate its values */
- if (GES_IS_TRACK_TRANSITION (tmp->data)) {
- g_object_get (tmp->data, "start", &tr_start, "duration", &tr_duration,
- NULL);
+ track = ges_track_object_get_track (track_object);
+ track_objects = ges_track_get_objects (track);
- if (tr_start + tr_duration == compared_start + compared_duration) {
- GESTimelineObject *tlobj;
- tlobj = ges_track_object_get_timeline_object (tmp->data);
+ cur = g_list_find (track_objects, track_object);
- trans = GES_TIMELINE_STANDARD_TRANSITION (tlobj);
- break;
- }
- }
+ for (tmp = cur->next; tmp; tmp = tmp->next) {
+ if (GES_IS_TRACK_SOURCE (tmp->data)) {
+ break;
}
-
- if (compared_end <= start) {
- if (trans) {
- ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
- g_object_get (compared_object, "priority", &priority, NULL);
- g_object_set (object, "priority", priority, NULL);
- }
-
- goto clean;
- } else if (start > compared_start && end < compared_end) {
- if (trans) {
- /* Transition not needed anymore */
- ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
- }
- goto clean;
- } else if (start <= compared_start) {
- if (trans) {
- ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
- }
-
- goto clean;
+ if (GES_IS_TRACK_AUDIO_TRANSITION (tmp->data)
+ || GES_IS_TRACK_VIDEO_TRANSITION (tmp->data)) {
+ ges_timeline_layer_remove_object (layer,
+ ges_track_object_get_timeline_object (tmp->data));
}
+ }
- } else {
- if (compared->next && GES_IS_TRACK_TRANSITION (compared->next->data)) {
- trans = GES_TIMELINE_STANDARD_TRANSITION
- (ges_track_object_get_timeline_object (compared->next->data));
- g_object_get (compared->prev->data, "start", &tr_start, "duration",
- &tr_duration, NULL);
- if (tr_start >= compared_start && tr_start + tr_duration <= compared_end)
- ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
- trans = NULL;
- }
- for (tmp = compared->prev; tmp; tmp = tmp->prev) {
- if GES_IS_TRACK_TRANSITION
- (tmp->data) {
- g_object_get (tmp->data, "start", &tr_start, "duration", &tr_duration,
- NULL);
- if (tr_start == compared_start) {
- trans = GES_TIMELINE_STANDARD_TRANSITION
- (ges_track_object_get_timeline_object (tmp->data));
- break;
- }
- }
+ for (tmp = cur->prev; tmp; tmp = tmp->prev) {
+ if (GES_IS_TRACK_SOURCE (tmp->data)) {
+ break;
}
-
- if (start + duration <= compared_start) {
- if (trans) {
- ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
- g_object_get (object, "priority", &priority, NULL);
- g_object_set (compared_object, "priority", priority, NULL);
- }
- goto clean;
-
- } else if (start > compared_start) {
- if (trans)
- ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
-
- goto clean;
- } else if (start < compared_start && end > compared_end) {
- if (trans) {
- ges_timeline_layer_remove_object (layer, GES_TIMELINE_OBJECT (trans));
- }
-
- goto clean;
+ if (GES_IS_TRACK_AUDIO_TRANSITION (tmp->data)
+ || GES_IS_TRACK_VIDEO_TRANSITION (tmp->data)) {
+ ges_timeline_layer_remove_object (layer,
+ ges_track_object_get_timeline_object (tmp->data));
}
}
+ g_list_foreach (track_objects, (GFunc) g_object_unref, NULL);
+ g_list_free (track_objects);
+}
- if (!trans) {
- gint height;
-
- trans =
- ges_timeline_standard_transition_new_for_nick ((gchar *) "crossfade");
- track = ges_track_object_get_track (track_object);
-
- ges_timeline_object_set_supported_formats (GES_TIMELINE_OBJECT (trans),
- track->type);
-
- ges_timeline_layer_add_object (layer, GES_TIMELINE_OBJECT (trans));
-
- if (ahead) {
- first_object = ges_track_object_get_timeline_object (compared->data);
- second_object = object;
- } else {
- second_object = ges_track_object_get_timeline_object (compared->data);
- first_object = object;
- }
+/**
+ * ges_timeline_layer_resync_priorities:
+ * @layer: a #GESTimelineLayer
+ *
+ * Resyncs the priorities of the objects controlled by @layer.
+ * This method
+ */
+static gboolean
+ges_timeline_layer_resync_priorities (GESTimelineLayer * layer)
+{
+ GList *tmp;
+ GESTimelineObject *obj;
- g_object_get (first_object, "priority", &priority, "height", &height, NULL);
- g_object_set (second_object, "priority", priority + height, NULL);
- g_signal_connect (first_object, "notify::height",
- (GCallback) timeline_object_height_changed_cb, second_object);
- }
+ GST_DEBUG ("Resync priorities of %p", layer);
- if (ahead) {
- g_object_set (trans, "start", start, "duration",
- compared_duration + compared_start - start, NULL);
- } else {
- g_object_set (trans, "start", compared_start, "duration",
- start + duration - compared_start, NULL);
+ /* TODO : Inhibit composition updates while doing this.
+ * Ideally we want to do it from an even higher level, but here will
+ * do in the meantime. */
+
+ for (tmp = layer->priv->objects_start; tmp; tmp = tmp->next) {
+ obj = GES_TIMELINE_OBJECT (tmp->data);
+ ges_timeline_object_set_priority (obj, GES_TIMELINE_OBJECT_PRIORITY (obj));
}
-clean:
- g_object_unref (layer);
+ return TRUE;
}
+/* Callbacks */
+
static void
-look_for_transition (GESTrackObject * track_object, GESTimelineLayer * layer)
+track_object_duration_cb (GESTrackObject * track_object,
+ GParamSpec * arg G_GNUC_UNUSED)
{
- GESTrack *track;
- GList *track_objects, *tmp, *cur;
+ GESTimelineLayer *layer;
+ GESTimelineObject *tlobj;
- track = ges_track_object_get_track (track_object);
+ tlobj = ges_track_object_get_timeline_object (track_object);
+ layer = ges_timeline_object_get_layer (tlobj);
+ if (G_LIKELY (GES_IS_TRACK_SOURCE (track_object)))
+ calculate_next_transition (track_object, layer);
+}
- track_objects = ges_track_get_objects (track);
+static void
+track_object_removed_cb (GESTrack * track, GESTrackObject * track_object)
+{
+ GList *track_objects, *tmp, *cur;
+ GESTimelineLayer *layer;
+ track_objects = ges_track_get_objects (track);
cur = g_list_find (track_objects, track_object);
-
for (tmp = cur->next; tmp; tmp = tmp->next) {
if (GES_IS_TRACK_SOURCE (tmp->data)) {
break;
}
if (GES_IS_TRACK_AUDIO_TRANSITION (tmp->data)
|| GES_IS_TRACK_VIDEO_TRANSITION (tmp->data)) {
- ges_timeline_layer_remove_object (layer,
- ges_track_object_get_timeline_object (tmp->data));
+ layer =
+ ges_timeline_object_get_layer (ges_track_object_get_timeline_object
+ (tmp->data));
+ if (ges_timeline_layer_get_auto_transition (layer)) {
+ ges_track_enable_update (track, FALSE);
+ ges_timeline_layer_remove_object (layer,
+ ges_track_object_get_timeline_object (tmp->data));
+ ges_track_enable_update (track, TRUE);
+ }
+ g_object_unref (layer);
}
}
}
if (GES_IS_TRACK_AUDIO_TRANSITION (tmp->data)
|| GES_IS_TRACK_VIDEO_TRANSITION (tmp->data)) {
- ges_timeline_layer_remove_object (layer,
- ges_track_object_get_timeline_object (tmp->data));
+ layer =
+ ges_timeline_object_get_layer (ges_track_object_get_timeline_object
+ (tmp->data));
+ if (ges_timeline_layer_get_auto_transition (layer)) {
+ ges_track_enable_update (track, FALSE);
+ ges_timeline_layer_remove_object (layer,
+ ges_track_object_get_timeline_object (tmp->data));
+ ges_track_enable_update (track, TRUE);
+ }
+ g_object_unref (layer);
}
}
- g_list_foreach (track_objects, (GFunc) g_object_unref, NULL);
- g_list_free (track_objects);
+ g_object_unref (track_object);
}
-static gboolean
-disconnect_handlers (GESTrack * track, gpointer * ptr)
+static void
+track_object_changed_cb (GESTrackObject * track_object,
+ GParamSpec * arg G_GNUC_UNUSED)
{
- g_signal_handler_disconnect (track, GPOINTER_TO_INT (ptr));
+ if (G_LIKELY (GES_IS_TRACK_SOURCE (track_object)))
+ calculate_transitions (track_object);
+}
- return TRUE;
+static void
+track_object_added_cb (GESTrack * track, GESTrackObject * track_object,
+ GESTimelineLayer * layer)
+{
+ GST_ERROR ("TRACKOBJECTADDED %i", GES_IS_TRACK_SOURCE (track_object));
+ if (GES_IS_TRACK_SOURCE (track_object)) {
+ g_signal_connect (G_OBJECT (track_object), "notify::start",
+ G_CALLBACK (track_object_changed_cb), NULL);
+ g_signal_connect (G_OBJECT (track_object), "notify::duration",
+ G_CALLBACK (track_object_duration_cb), NULL);
+ calculate_transitions (track_object);
+ }
+
+}
+
+static void
+track_removed_cb (GESTrack * track, GESTrackObject * track_object,
+ GESTimelineLayer * layer)
+{
+ g_signal_handlers_disconnect_by_func (track, track_object_added_cb, layer);
+ g_signal_handlers_disconnect_by_func (track, track_object_removed_cb, NULL);
+}
+
+static void
+track_added_cb (GESTrack * track, GESTrackObject * track_object,
+ GESTimelineLayer * layer)
+{
+ g_signal_connect (track, "track-object-removed",
+ (GCallback) track_object_removed_cb, NULL);
+ g_signal_connect (track, "track-object-added",
+ (GCallback) track_object_added_cb, NULL);
+}
+
+static void
+timeline_object_height_changed_cb (GESTimelineObject * obj,
+ GESTrackEffect * tr_eff, GESTimelineObject * second_obj)
+{
+ gint priority, height;
+ g_object_get (obj, "height", &height, "priority", &priority, NULL);
+ g_object_set (second_obj, "priority", priority + height, NULL);
+}
+
+static void
+start_calculating_transitions (GESTimelineLayer * layer)
+{
+ GList *tmp, *tracks = ges_timeline_get_tracks (layer->timeline);
+
+ g_signal_connect (layer->timeline, "track-added", G_CALLBACK (track_added_cb),
+ layer);
+ g_signal_connect (layer->timeline, "track-removed",
+ G_CALLBACK (track_removed_cb), layer);
+
+ for (tmp = tracks; tmp; tmp = tmp->next) {
+ g_signal_connect (G_OBJECT (tmp->data), "track-object-added",
+ G_CALLBACK (track_object_added_cb), layer);
+ g_signal_connect (G_OBJECT (tmp->data), "track-object-removed",
+ G_CALLBACK (track_object_removed_cb), NULL);
+ }
+
+ g_list_free_full (tracks, g_object_unref);
+
+ /* FIXME calculate all the transitions at that time */
}
+/* Public methods */
/**
* ges_timeline_layer_remove_object:
* @layer: a #GESTimelineLayer
tl_obj_layer = ges_timeline_object_get_layer (object);
if (G_UNLIKELY (tl_obj_layer != layer)) {
GST_WARNING ("TimelineObject doesn't belong to this layer");
+
if (tl_obj_layer != NULL)
g_object_unref (tl_obj_layer);
+
return FALSE;
}
g_object_unref (tl_obj_layer);
- if (layer->priv->auto_transition) {
+ if (layer->priv->auto_transition && GES_IS_TIMELINE_SOURCE (object)) {
trackobjects = ges_timeline_object_get_track_objects (object);
for (tmp = trackobjects; tmp; tmp = tmp->next) {
g_list_free (trackobjects);
}
- g_hash_table_foreach_remove (layer->priv->signal_table,
- (GHRFunc) disconnect_handlers, NULL);
-
/* emit 'object-removed' */
g_signal_emit (layer, ges_timeline_layer_signals[OBJECT_REMOVED], 0, object);
}
/**
- * ges_timeline_layer_resync_priorities:
- * @layer: a #GESTimelineLayer
- *
- * Resyncs the priorities of the objects controlled by @layer.
- * This method
- */
-gboolean
-ges_timeline_layer_resync_priorities (GESTimelineLayer * layer)
-{
- GList *tmp;
- GESTimelineObject *obj;
-
- GST_DEBUG ("Resync priorities of %p", layer);
-
- /* TODO : Inhibit composition updates while doing this.
- * Ideally we want to do it from an even higher level, but here will
- * do in the meantime. */
-
- for (tmp = layer->priv->objects_start; tmp; tmp = tmp->next) {
- obj = GES_TIMELINE_OBJECT (tmp->data);
- ges_timeline_object_set_priority (obj, GES_TIMELINE_OBJECT_PRIORITY (obj));
- }
-
- return TRUE;
-}
-
-/**
* ges_timeline_layer_set_priority:
* @layer: a #GESTimelineLayer
* @priority: the priority to set
gboolean auto_transition)
{
- GList *tmp;
g_return_if_fail (GES_IS_TIMELINE_LAYER (layer));
- if (auto_transition) {
- for (tmp = layer->priv->objects_start; tmp; tmp = tmp->next) {
- if (GES_IS_TIMELINE_SOURCE (tmp->data)) {
- g_signal_connect (G_OBJECT (tmp->data), "track-object-added",
- G_CALLBACK (track_object_added_cb), layer);
- g_signal_connect (G_OBJECT (tmp->data), "track-object-removed",
- G_CALLBACK (track_object_removed_cb), layer);
- }
- }
- /* FIXME calculate all the transitions at that time */
- }
+ if (auto_transition && layer->timeline)
+ start_calculating_transitions (layer);
+
layer->priv->auto_transition = auto_transition;
}
ret = g_list_reverse (ret);
return ret;
}
+
+/**
+ * ges_timeline_layer_is_empty:
+ * @layer: The #GESTimelineLayer to check
+ *
+ * Convenience method to check if @layer is empty (doesn't contain any object),
+ * or not.
+ *
+ * Returns: %TRUE if @layer is empty, %FALSE if it already contains at least
+ * one #GESTimelineObject
+ */
+gboolean
+ges_timeline_layer_is_empty (GESTimelineLayer * layer)
+{
+ g_return_val_if_fail (GES_IS_TIMELINE_LAYER (layer), FALSE);
+
+ return (layer->priv->objects_start == NULL);
+}
+
+/**
+ * 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.
+ *
+ * Calling this method will construct and properly set all the media related
+ * elements on @object. If you need to know when those objects (actually #GESTrackObject)
+ * are constructed, you should connect to the object::track-object-added signal which
+ * is emited right after those elements are ready to be used.
+ *
+ * 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)
+{
+ GESTimelineLayer *tl_obj_layer;
+ guint32 maxprio, minprio, prio;
+
+ GST_DEBUG ("layer:%p, object:%p", layer, object);
+
+ tl_obj_layer = ges_timeline_object_get_layer (object);
+
+ if (G_UNLIKELY (tl_obj_layer)) {
+ GST_WARNING ("TimelineObject %p already belongs to another layer", object);
+ g_object_unref (tl_obj_layer);
+ return FALSE;
+ }
+
+ g_object_ref_sink (object);
+
+ /* Take a reference to the object and store it stored by start/priority */
+ layer->priv->objects_start =
+ g_list_insert_sorted (layer->priv->objects_start, object,
+ (GCompareFunc) objects_start_compare);
+
+ /* Inform the object it's now in this layer */
+ ges_timeline_object_set_layer (object, layer);
+
+ GST_DEBUG ("current object priority : %d, layer min/max : %d/%d",
+ GES_TIMELINE_OBJECT_PRIORITY (object),
+ layer->min_gnl_priority, layer->max_gnl_priority);
+
+ /* Set the priority. */
+ maxprio = layer->max_gnl_priority;
+ minprio = layer->min_gnl_priority;
+ prio = GES_TIMELINE_OBJECT_PRIORITY (object);
+ if (minprio + prio > (maxprio)) {
+ GST_WARNING ("%p is out of the layer %p space, setting its priority to "
+ "setting its priority %d to failthe maximum priority of the layer %d",
+ object, layer, prio, maxprio - minprio);
+ ges_timeline_object_set_priority (object, LAYER_HEIGHT - 1);
+ }
+ /* If the object has an acceptable priority, we just let it with its current
+ * priority */
+
+ ges_timeline_layer_resync_priorities (layer);
+
+ /* emit 'object-added' */
+ g_signal_emit (layer, ges_timeline_layer_signals[OBJECT_ADDED], 0, object);
+
+ return TRUE;
+}
+
+/**
+ * ges_timeline_layer_new:
+ *
+ * Creates a new #GESTimelineLayer.
+ *
+ * Returns: A new #GESTimelineLayer
+ */
+GESTimelineLayer *
+ges_timeline_layer_new (void)
+{
+ return g_object_new (GES_TYPE_TIMELINE_LAYER, NULL);
+}
+
+/**
+ * ges_timeline_layer_get_timeline:
+ * @layer: The #GESTimelineLayer to get the parent #GESTimeline from
+ *
+ * Get the #GESTimeline in which #GESTimelineLayer currently is.
+ *
+ * Returns: (transfer none): the #GESTimeline in which #GESTimelineLayer
+ * currently is or %NULL if not in any timeline yet.
+ */
+GESTimeline *
+ges_timeline_layer_get_timeline (GESTimelineLayer * layer)
+{
+ g_return_val_if_fail (GES_IS_TIMELINE_LAYER (layer), NULL);
+
+ return layer->timeline;
+}
+
+void
+ges_timeline_layer_set_timeline (GESTimelineLayer * layer,
+ GESTimeline * timeline)
+{
+ GST_DEBUG ("layer:%p, timeline:%p", layer, timeline);
+
+ if (layer->priv->auto_transition == TRUE) {
+ if (layer->timeline != NULL) {
+ g_signal_handlers_disconnect_by_func (layer->timeline, track_added_cb,
+ layer);
+ g_signal_handlers_disconnect_by_func (layer->timeline, track_removed_cb,
+ layer);
+ }
+
+ layer->timeline = timeline;
+ if (timeline != NULL)
+ start_calculating_transitions (layer);
+
+ } else
+ layer->timeline = timeline;
+}