remove GESTrackBackgroundSource class

diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt
index 27cb34e..b703384 100644 (file)
--- a/docs/libs/ges-sections.txt
+++ b/docs/libs/ges-sections.txt
@@ -393,22 +393,6 @@ GES_TYPE_TRACK_VIDEO_BACKGROUND_SOURCE
 </SECTION>
 
 <SECTION>
-<FILE>ges-track-background-source</FILE>
-<TITLE>GESTrackBackgroundSource</TITLE>
-GESTrackBackgroundSource
-GESTrackBackgroundSourceClass
-ges_track_background_source_new
-ges_track_bg_src_get_type
-<SUBSECTION Standard>
-GES_IS_TRACK_BACKGROUND_SOURCE
-GES_IS_TRACK_BACKGROUND_SOURCE_CLASS
-GES_TRACK_BACKGROUND_SOURCE
-GES_TRACK_BACKGROUND_SOURCE_CLASS
-GES_TRACK_BACKGROUND_SOURCE_GET_CLASS
-GES_TYPE_TRACK_BACKGROUND_SOURCE
-</SECTION>
-
-<SECTION>
 <FILE>ges-track-title-source</FILE>
 <TITLE>GESTrackTitleSource</TITLE>
 GESTrackTitleSource

diff --git a/ges/Makefile.am b/ges/Makefile.am
index 1edcf93..b72fe0c 100644 (file)
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -28,7 +28,6 @@ libges_@GST_MAJORMINOR@_la_SOURCES =          \
        ges-track-transition.c                  \
        ges-track-audio-transition.c                    \
        ges-track-video-transition.c                    \
-       ges-track-background-source.c                   \
        ges-track-video-background-source.c                     \
        ges-track-audio-background-source.c                     \
        ges-track-title-source.c                        \
@@ -61,7 +60,6 @@ libges_@GST_MAJORMINOR@include_HEADERS =      \
        ges-track-transition.h                  \
        ges-track-audio-transition.h                    \
        ges-track-video-transition.h                    \
-       ges-track-background-source.h                   \
        ges-track-video-background-source.h                     \
        ges-track-audio-background-source.h                     \
        ges-track-title-source.h                        \

diff --git a/ges/ges-timeline-background-source.c b/ges/ges-timeline-background-source.c
index 42cd7f8..ed1e7d9 100644 (file)
--- a/ges/ges-timeline-background-source.c
+++ b/ges/ges-timeline-background-source.c
@@ -238,9 +238,8 @@ ges_tl_bg_src_create_track_object (GESTimelineObject * obj, GESTrack * track)
       ges_track_object_set_active (res, FALSE);
   }
 
-  else {
-    res = (GESTrackObject *) ges_track_background_source_new ();
-  }
+  else
+    res = NULL;
 
   return res;
 }

diff --git a/ges/ges-track-audio-background-source.h b/ges/ges-track-audio-background-source.h
index 9be0933..2d9ba80 100644 (file)
--- a/ges/ges-track-audio-background-source.h
+++ b/ges/ges-track-audio-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
 

diff --git a/ges/ges-track-background-source.c b/ges/ges-track-background-source.c
deleted file mode 100644 (file)
index 111c5e5..0000000
--- a/ges/ges-track-background-source.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* GStreamer Editing Services
- * Copyright (C) 2009 Edward Hervey <edward.hervey@collabora.co.uk>
- *               2009 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/**
- * SECTION:ges-track-background-source
- * @short_description: Base Class for background source track objects
- */
-
-#include "ges-internal.h"
-#include "ges-track-background-source.h"
-
-G_DEFINE_TYPE (GESTrackBackgroundSource, ges_track_bg_src,
-    GES_TYPE_TRACK_SOURCE);
-
-static void ges_track_bg_src_get_property (GObject * object, guint property_id,
-    GValue * value, GParamSpec * pspec);
-
-static void ges_track_bg_src_dispose (GObject *);
-
-static void ges_track_bg_src_finalize (GObject *);
-
-static void ges_track_bg_src_set_property (GObject * object, guint property_id,
-    const GValue * value, GParamSpec * pspec);
-
-static gboolean ges_track_bg_src_create_gnl_object (GESTrackObject * object);
-
-static GstElement
-    * ges_track_bg_src_create_element_func (GESTrackBackgroundSource * object);
-
-enum
-{
-  PROP_0,
-};
-
-static void
-ges_track_bg_src_class_init (GESTrackBackgroundSourceClass * klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GESTrackObjectClass *track_class = GES_TRACK_OBJECT_CLASS (klass);
-
-  object_class->get_property = ges_track_bg_src_get_property;
-  object_class->set_property = ges_track_bg_src_set_property;
-  object_class->dispose = ges_track_bg_src_dispose;
-  object_class->finalize = ges_track_bg_src_finalize;
-
-  track_class->create_gnl_object = ges_track_bg_src_create_gnl_object;
-  klass->create_element = ges_track_bg_src_create_element_func;
-}
-
-static void
-ges_track_bg_src_dispose (GObject * object)
-{
-  G_OBJECT_CLASS (ges_track_bg_src_parent_class)->dispose (object);
-}
-
-static void
-ges_track_bg_src_init (GESTrackBackgroundSource * self)
-{
-  self->element = NULL;
-}
-
-static void
-ges_track_bg_src_get_property (GObject * object, guint property_id,
-    GValue * value, GParamSpec * pspec)
-{
-  switch (property_id) {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-  }
-}
-
-static void
-ges_track_bg_src_set_property (GObject * object, guint property_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  switch (property_id) {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-  }
-}
-
-static void
-ges_track_bg_src_finalize (GObject * object)
-{
-  G_OBJECT_CLASS (ges_track_bg_src_parent_class)->finalize (object);
-}
-
-static gboolean
-ges_track_bg_src_create_gnl_object (GESTrackObject * object)
-{
-  GESTrackBackgroundSourceClass *klass;
-  GESTrackBackgroundSource *self;
-
-  self = GES_TRACK_BACKGROUND_SOURCE (object);
-  klass = GES_TRACK_BACKGROUND_SOURCE_GET_CLASS (object);
-
-  object->gnlobject = gst_element_factory_make ("gnlsource", NULL);
-  self->element = klass->create_element (GES_TRACK_BACKGROUND_SOURCE (object));
-  gst_bin_add (GST_BIN (object->gnlobject), self->element);
-
-  return TRUE;
-}
-
-static GstElement *
-ges_track_bg_src_create_element_func (GESTrackBackgroundSource * self)
-{
-  return gst_element_factory_make ("fakesrc", NULL);
-}
-
-GESTrackBackgroundSource *
-ges_track_background_source_new (void)
-{
-  return g_object_new (GES_TYPE_TRACK_BACKGROUND_SOURCE, NULL);
-}

diff --git a/ges/ges-track-background-source.h b/ges/ges-track-background-source.h
deleted file mode 100644 (file)
index 3ad4663..0000000
--- a/ges/ges-track-background-source.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* GStreamer Editing Services
- * Copyright (C) 2010 Brandon Lewis <brandon.lewis@collabora.co.uk>
- *               2010 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _GES_TRACK_BACKGROUND_SOURCE
-#define _GES_TRACK_BACKGROUND_SOURCE
-
-#include <glib-object.h>
-#include <gst/gst.h>
-#include <ges/ges-types.h>
-#include <ges/ges-track-source.h>
-
-G_BEGIN_DECLS
-
-#define GES_TYPE_TRACK_BACKGROUND_SOURCE ges_track_bg_src_get_type()
-
-#define GES_TRACK_BACKGROUND_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRACK_BACKGROUND_SOURCE, GESTrackBackgroundSource))
-
-#define GES_TRACK_BACKGROUND_SOURCE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRACK_BACKGROUND_SOURCE, GESTrackBackgroundSourceClass))
-
-#define GES_IS_TRACK_BACKGROUND_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRACK_BACKGROUND_SOURCE))
-
-#define GES_IS_TRACK_BACKGROUND_SOURCE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRACK_BACKGROUND_SOURCE))
-
-#define GES_TRACK_BACKGROUND_SOURCE_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_BACKGROUND_SOURCE, GESTrackBackgroundSourceClass))
-/** 
- * GESTrackBackgroundSource:
- * @parent: parent
- *
- */
-struct _GESTrackBackgroundSource {
-  GESTrackSource parent;
-
-  /*< private >*/
-  GstElement *element;
-};
-
-/**
- * GESTrackBackgroundSourceClass:
- * @parent_class: parent class
- */
-
-struct _GESTrackBackgroundSourceClass {
-  GESTrackSourceClass parent_class;
-
-  /*< public >*/
-  GstElement* (*create_element) (GESTrackBackgroundSource *obj);
-};
-
-GType ges_track_bg_src_get_type (void);
-
-GESTrackBackgroundSource* ges_track_background_source_new (void);
-
-G_END_DECLS
-
-#endif /* _GES_TRACK_BACKGROUND_SOURCE */
-

diff --git a/ges/ges-types.h b/ges/ges-types.h
index 6249236..3c8d001 100644 (file)
--- a/ges/ges-types.h
+++ b/ges/ges-types.h
@@ -80,10 +80,6 @@ typedef struct _GESTrackVideoTransition GESTrackVideoTransition;
 typedef struct _GESTrackVideoTransitionClass
   GESTrackVideoTransitionClass;
 
-typedef struct _GESTrackBackgroundSource GESTrackBackgroundSource;
-typedef struct _GESTrackBackgroundSourceClass
-  GESTrackBackgroundSourceClass;
-
 typedef struct _GESTrackVideoBackgroundSource GESTrackVideoBackgroundSource;
 typedef struct _GESTrackVideoBackgroundSourceClass
   GESTrackVideoBackgroundSourceClass;

diff --git a/ges/ges.h b/ges/ges.h
index ae5174f..d939a82 100644 (file)
--- a/ges/ges.h
+++ b/ges/ges.h
@@ -43,7 +43,6 @@
 #include <ges/ges-custom-timeline-source.h>
 #include <ges/ges-timeline-file-source.h>
 #include <ges/ges-track-filesource.h>
-#include <ges/ges-track-background-source.h>
 #include <ges/ges-track-video-background-source.h>
 #include <ges/ges-track-audio-background-source.h>
 #include <ges/ges-track-title-source.h>