From: Brandon Lewis <brandon@collabora.co.uk>
Date: Wed, 23 Jun 2010 14:32:25 +0000 (+0200)
Subject: create timeline-overly creates appropriate track object
X-Git-Tag: 1.19.3~493^2~2846
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=734d95bfb85ea2fb54b642d7379d9b466f8b1ae6;p=platform%2Fupstream%2Fgstreamer.git

create timeline-overly creates appropriate track object
---

diff --git a/ges/ges-timeline-overlay.c b/ges/ges-timeline-overlay.c
index 1043e41..556c508 100644
--- a/ges/ges-timeline-overlay.c
+++ b/ges/ges-timeline-overlay.c
@@ -31,8 +31,7 @@
 #include "ges-timeline-source.h"
 #include "ges-track-object.h"
 #include "ges-track-video-title-source.h"
-//#include "ges-track-video-overlay.h"
-//#include "ges-track-audio-overlay.h"
+#include "ges-track-video-overlay.h"
 #include <string.h>
 
 G_DEFINE_TYPE (GESTimelineOverlay, ges_tl_overlay, GES_TYPE_TIMELINE_OBJECT);
@@ -384,7 +383,6 @@ static GESTrackObject *
 ges_tl_overlay_create_track_object (GESTimelineObject * obj, GESTrack * track)
 {
 
-#if 0
   GESTimelineOverlay *tfs = (GESTimelineOverlay *) obj;
   GESTrackObject *res = NULL;
 
@@ -396,19 +394,11 @@ ges_tl_overlay_create_track_object (GESTimelineObject * obj, GESTrack * track)
     ges_track_video_overlay_set_text ((GESTrackVideoOverlay *) res, tfs->text);
   }
 
-  else if (track->type == GES_TRACK_TYPE_AUDIO) {
-    res = (GESTrackObject *) ges_track_audio_overlay_new ();
-    if (tfs->mute)
-      ges_track_object_set_active (res, FALSE);
-  }
-
   else {
     res = GES_TRACK_OBJECT (ges_track_overlay_new ());
   }
 
   return res;
-#endif
-  return NULL;
 }
 
 /**