From cf93469fa5cec859b042c35b5994ce8fb62594ef Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Sat, 29 Dec 2012 18:24:05 -0300 Subject: [PATCH] Misc nitpick fixing --- ges/ges-timeline-file-source.c | 2 -- ges/ges-timeline-layer.c | 4 ++-- ges/ges-timeline.c | 2 +- ges/ges-track.c | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ges/ges-timeline-file-source.c b/ges/ges-timeline-file-source.c index 147c089..1fec629 100644 --- a/ges/ges-timeline-file-source.c +++ b/ges/ges-timeline-file-source.c @@ -247,8 +247,6 @@ extractable_set_asset (GESExtractable * self, GESAsset * asset) (GES_ASSET_TIMELINE_OBJECT (filesource_asset))); } - ges_timeline_filesource_set_uri (tfs, g_strdup (ges_asset_get_id (asset))); - GES_TIMELINE_OBJECT (tfs)->asset = asset; } diff --git a/ges/ges-timeline-layer.c b/ges/ges-timeline-layer.c index 1f4edd6..450e7c0 100644 --- a/ges/ges-timeline-layer.c +++ b/ges/ges-timeline-layer.c @@ -1057,8 +1057,8 @@ ges_timeline_layer_add_object (GESTimelineLayer * layer, * Creates TimelineObject from asset, adds it to layer and * returns a reference to it. * - * Returns: (transfer floating): Created #GESTimelineObject -*/ + * Returns: (transfer none): Created #GESTimelineObject + */ GESTimelineObject * ges_timeline_layer_add_asset (GESTimelineLayer * layer, GESAsset * asset, GstClockTime start, GstClockTime inpoint, diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c index ba524c6..2db20e8 100644 --- a/ges/ges-timeline.c +++ b/ges/ges-timeline.c @@ -1497,7 +1497,7 @@ add_object_to_tracks (GESTimeline * timeline, GESTimelineObject * object, { gint i; GPtrArray *tracks = NULL; - GESTrackType types, visited_type = 1; + GESTrackType types, visited_type = GES_TRACK_TYPE_UNKNOWN; GList *tmp, *l, *track_objects; GST_DEBUG_OBJECT (timeline, "Creating %" GST_PTR_FORMAT diff --git a/ges/ges-track.c b/ges/ges-track.c index 596843f..67e1bbf 100644 --- a/ges/ges-track.c +++ b/ges/ges-track.c @@ -755,7 +755,6 @@ ges_track_set_caps (GESTrack * track, const GstCaps * caps) GST_DEBUG ("track:%p, caps:%" GST_PTR_FORMAT, track, caps); g_return_if_fail (GST_IS_CAPS (caps)); - GST_DEBUG ("IS CAPS MOFOP:%p, caps:%" GST_PTR_FORMAT, track, caps); priv = track->priv; -- 2.7.4