remove GESTrackAudioTitleSource

diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt
index 0ffb143..d6f9f85 100644 (file)
--- a/docs/libs/ges-sections.txt
+++ b/docs/libs/ges-sections.txt
@@ -462,29 +462,6 @@ GES_TYPE_TRACK_VIDEO_TITLE_SOURCE
 </SECTION>
 
 <SECTION>
-<FILE>ges-track-audio-title-source</FILE>
-<TITLE>GESTrackAudioTitleSource</TITLE>
-GESTrackAudioTitleSource
-GESTrackAudioTitleSourceClass
-ges_track_audio_title_source_new
-ges_track_audio_title_src_get_type
-DEFAULT_HALIGNMENT
-DEFAULT_VALIGNMENT
-GESTrackVideoTitleSrcHAlign
-GESTrackVideoTitleSrcVAlign
-ges_track_video_title_source_set_halignment
-ges_track_video_title_source_set_valignment
-DEFAULT_FONT_DESC
-<SUBSECTION Standard>
-GES_IS_TRACK_AUDIO_TITLE_SOURCE
-GES_IS_TRACK_AUDIO_TITLE_SOURCE_CLASS
-GES_TRACK_AUDIO_TITLE_SOURCE
-GES_TRACK_AUDIO_TITLE_SOURCE_CLASS
-GES_TRACK_AUDIO_TITLE_SOURCE_GET_CLASS
-GES_TYPE_TRACK_AUDIO_TITLE_SOURCE
-</SECTION>
-
-<SECTION>
 <FILE>ges-track-overlay</FILE>
 <TITLE>GESTrackOverlay</TITLE>
 GESTrackOverlay

diff --git a/ges/Makefile.am b/ges/Makefile.am
index 43b2d89..1edcf93 100644 (file)
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -33,7 +33,6 @@ libges_@GST_MAJORMINOR@_la_SOURCES =          \
        ges-track-audio-background-source.c                     \
        ges-track-title-source.c                        \
        ges-track-video-title-source.c                  \
-       ges-track-audio-title-source.c                  \
        ges-track-overlay.c                     \
        ges-track-video-overlay.c                       \
        ges-utils.c
@@ -67,7 +66,6 @@ libges_@GST_MAJORMINOR@include_HEADERS =      \
        ges-track-audio-background-source.h                     \
        ges-track-title-source.h                        \
        ges-track-video-title-source.h                  \
-       ges-track-audio-title-source.h                  \
        ges-track-overlay.h                     \
        ges-track-video-overlay.h                       \
        ges-utils.h

diff --git a/ges/ges-track-audio-title-source.c b/ges/ges-track-audio-title-source.c
deleted file mode 100644 (file)
index 1c3a12a..0000000
--- a/ges/ges-track-audio-title-source.c
+++ /dev/null
@@ -1,125 +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.
- */
-
-/* TODO: this class is nearly identical to the corresponding background
- * source. Maybe we chould have a "GESTrackSilentAudioSource" that's shared
- * among several timeline objects. There's no particular reason why the track
- * object hierarchy has to be exactly parallel to the timeline object
- * hierarchy. If anything, that's the motivation for separating them.
- */
-
-/**
- * SECTION:ges-track-audio-title-source
- * @short_description: silent audio source associated with stand-alone title
- */
-
-#include "ges-internal.h"
-#include "ges-track-object.h"
-#include "ges-track-audio-title-source.h"
-
-G_DEFINE_TYPE (GESTrackAudioTitleSource, ges_track_audio_title_src,
-    GES_TYPE_TRACK_TITLE_SOURCE);
-
-enum
-{
-  PROP_0,
-};
-
-static void ges_track_audio_title_src_dispose (GObject * object);
-
-static void ges_track_audio_title_src_finalize (GObject * object);
-
-static void ges_track_audio_title_src_get_property (GObject * object, guint
-    property_id, GValue * value, GParamSpec * pspec);
-
-static void ges_track_audio_title_src_set_property (GObject * object, guint
-    property_id, const GValue * value, GParamSpec * pspec);
-
-static GstElement *ges_track_audio_title_src_create_element (GESTrackTitleSource
-    * self);
-
-static void
-ges_track_audio_title_src_class_init (GESTrackAudioTitleSourceClass * klass)
-{
-  GObjectClass *object_class;
-  GESTrackTitleSourceClass *bg_class;
-
-  object_class = G_OBJECT_CLASS (klass);
-  bg_class = GES_TRACK_TITLE_SOURCE_CLASS (klass);
-
-  object_class->get_property = ges_track_audio_title_src_get_property;
-  object_class->set_property = ges_track_audio_title_src_set_property;
-  object_class->dispose = ges_track_audio_title_src_dispose;
-  object_class->finalize = ges_track_audio_title_src_finalize;
-
-  bg_class->create_element = ges_track_audio_title_src_create_element;
-}
-
-static void
-ges_track_audio_title_src_init (GESTrackAudioTitleSource * self)
-{
-}
-
-static void
-ges_track_audio_title_src_dispose (GObject * object)
-{
-  G_OBJECT_CLASS (ges_track_audio_title_src_parent_class)->dispose (object);
-}
-
-static void
-ges_track_audio_title_src_finalize (GObject * object)
-{
-  G_OBJECT_CLASS (ges_track_audio_title_src_parent_class)->finalize (object);
-}
-
-static void
-ges_track_audio_title_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_audio_title_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 GstElement *
-ges_track_audio_title_src_create_element (GESTrackTitleSource * self)
-{
-  GstElement *ret;
-  ret = gst_element_factory_make ("audiotestsrc", NULL);
-  g_object_set (ret, "volume", (gdouble) 0, NULL);
-  return ret;
-}
-
-GESTrackAudioTitleSource *
-ges_track_audio_title_source_new (void)
-{
-  return g_object_new (GES_TYPE_TRACK_AUDIO_TITLE_SOURCE, NULL);
-}

diff --git a/ges/ges-track-audio-title-source.h b/ges/ges-track-audio-title-source.h
deleted file mode 100644 (file)
index ae1fc0e..0000000
--- a/ges/ges-track-audio-title-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_AUDIO_TITLE_SOURCE
-#define _GES_TRACK_AUDIO_TITLE_SOURCE
-
-#include <glib-object.h>
-#include <ges/ges-types.h>
-#include <ges/ges-track-title-source.h>
-
-G_BEGIN_DECLS
-
-#define GES_TYPE_TRACK_AUDIO_TITLE_SOURCE ges_track_audio_title_src_get_type()
-
-#define GES_TRACK_AUDIO_TITLE_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRACK_AUDIO_TITLE_SOURCE, GESTrackAudioTitleSource))
-
-#define GES_TRACK_AUDIO_TITLE_SOURCE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRACK_AUDIO_TITLE_SOURCE, GESTrackAudioTitleSourceClass))
-
-#define GES_IS_TRACK_AUDIO_TITLE_SOURCE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRACK_AUDIO_TITLE_SOURCE))
-
-#define GES_IS_TRACK_AUDIO_TITLE_SOURCE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRACK_AUDIO_TITLE_SOURCE))
-
-#define GES_TRACK_AUDIO_TITLE_SOURCE_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_AUDIO_TITLE_SOURCE, GESTrackAudioTitleSourceClass))
-
-/** 
- * GESTrackAudioTitleSource:
- * @parent: parent
- *
- */
-
-struct _GESTrackAudioTitleSource {
-  GESTrackTitleSource parent;
-
-  /*< public >*/
-};
-
-/**
- * GESTrackAudioTitleSourceClass:
- * @parent_class: parent class
- *
- */
-
-struct _GESTrackAudioTitleSourceClass {
-  GESTrackTitleSourceClass parent_class;
-
-  /*< public >*/
-};
-
-GType ges_track_audio_title_src_get_type (void);
-
-GESTrackAudioTitleSource* ges_track_audio_title_source_new (void);
-
-G_END_DECLS
-
-#endif /* _GES_TRACK_AUDIO_TITLE_SOURCE */
-

diff --git a/ges/ges-types.h b/ges/ges-types.h
index 0b9c8f5..6249236 100644 (file)
--- a/ges/ges-types.h
+++ b/ges/ges-types.h
@@ -100,10 +100,6 @@ typedef struct _GESTrackVideoTitleSource GESTrackVideoTitleSource;
 typedef struct _GESTrackVideoTitleSourceClass
   GESTrackVideoTitleSourceClass;
 
-typedef struct _GESTrackAudioTitleSource GESTrackAudioTitleSource;
-typedef struct _GESTrackAudioTitleSourceClass
-  GESTrackAudioTitleSourceClass;
-
 typedef struct _GESTrackOverlay GESTrackOverlay;
 typedef struct _GESTrackOverlayClass
   GESTrackOverlayClass;

diff --git a/ges/ges.h b/ges/ges.h
index 446ecf7..ae5174f 100644 (file)
--- a/ges/ges.h
+++ b/ges/ges.h
@@ -48,7 +48,6 @@
 #include <ges/ges-track-audio-background-source.h>
 #include <ges/ges-track-title-source.h>
 #include <ges/ges-track-video-title-source.h>
-#include <ges/ges-track-audio-title-source.h>
 #include <ges/ges-track-overlay.h>
 #include <ges/ges-track-video-overlay.h>