From: Brandon Lewis <brandon@collabora.co.uk>
Date: Wed, 30 Jun 2010 14:25:01 +0000 (+0200)
Subject: GESTrackVideoBackgroundSource inherits directly from track object
X-Git-Tag: 1.19.3~493^2~2829
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=891826fdec6074c044fcd1cea456ebab03f8dbe0;p=platform%2Fupstream%2Fgstreamer.git

GESTrackVideoBackgroundSource inherits directly from track object
---

diff --git a/ges/ges-track-video-background-source.c b/ges/ges-track-video-background-source.c
index 7b13891..8304ba4 100644
--- a/ges/ges-track-video-background-source.c
+++ b/ges/ges-track-video-background-source.c
@@ -28,7 +28,7 @@
 #include "ges-track-video-background-source.h"
 
 G_DEFINE_TYPE (GESTrackVideoBackgroundSource, ges_track_vbg_src,
-    GES_TYPE_TRACK_BACKGROUND_SOURCE);
+    GES_TYPE_TRACK_SOURCE);
 
 enum
 {
@@ -45,24 +45,23 @@ static void ges_track_vbg_src_get_property (GObject * object, guint
 static void ges_track_vbg_src_set_property (GObject * object, guint
     property_id, const GValue * value, GParamSpec * pspec);
 
-static GstElement *ges_track_vbg_src_create_element (GESTrackBackgroundSource
-    * self);
+static GstElement *ges_track_vbg_src_create_element (GESTrackSource * self);
 
 static void
 ges_track_vbg_src_class_init (GESTrackVideoBackgroundSourceClass * klass)
 {
   GObjectClass *object_class;
-  GESTrackBackgroundSourceClass *bg_class;
+  GESTrackSourceClass *track_source_class;
 
   object_class = G_OBJECT_CLASS (klass);
-  bg_class = GES_TRACK_BACKGROUND_SOURCE_CLASS (klass);
+  track_source_class = GES_TRACK_SOURCE_CLASS (klass);
 
   object_class->get_property = ges_track_vbg_src_get_property;
   object_class->set_property = ges_track_vbg_src_set_property;
   object_class->dispose = ges_track_vbg_src_dispose;
   object_class->finalize = ges_track_vbg_src_finalize;
 
-  bg_class->create_element = ges_track_vbg_src_create_element;
+  track_source_class->create_element = ges_track_vbg_src_create_element;
 }
 
 static void
@@ -104,7 +103,7 @@ ges_track_vbg_src_set_property (GObject * object,
 }
 
 static GstElement *
-ges_track_vbg_src_create_element (GESTrackBackgroundSource * self)
+ges_track_vbg_src_create_element (GESTrackSource * self)
 {
   GstElement *ret;
   gint pattern;
@@ -121,7 +120,7 @@ ges_track_video_background_source_set_pattern (GESTrackVideoBackgroundSource
     * self, GESTrackVideoBgSrcPattern pattern)
 {
   GstElement *element;
-  element = GES_TRACK_BACKGROUND_SOURCE (self)->element;
+  element = GES_TRACK_SOURCE (self)->element;
   self->pattern = pattern;
   if (element)
     g_object_set (element, "pattern", (gint) pattern, NULL);
diff --git a/ges/ges-track-video-background-source.h b/ges/ges-track-video-background-source.h
index f687db3..32172e1 100644
--- a/ges/ges-track-video-background-source.h
+++ b/ges/ges-track-video-background-source.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 #include <ges/ges-types.h>
-#include <ges/ges-track-background-source.h>
+#include <ges/ges-track-source.h>
 
 G_BEGIN_DECLS
 
@@ -86,7 +86,7 @@ typedef enum {
  * @parent: parent
  */
 struct _GESTrackVideoBackgroundSource {
-  GESTrackBackgroundSource parent;
+  GESTrackSource parent;
 
   /*< private >*/
   GESTrackVideoBgSrcPattern pattern;
@@ -98,7 +98,7 @@ struct _GESTrackVideoBackgroundSource {
  */
 
 struct _GESTrackVideoBackgroundSourceClass {
-  GESTrackBackgroundSourceClass parent_class;
+  GESTrackSourceClass parent_class;
 
   /* <public> */
 };