From 1e7c1fa45084e87563d91fa14891f03f93ab576a Mon Sep 17 00:00:00 2001 From: Brandon Lewis Date: Wed, 30 Jun 2010 20:01:18 +0200 Subject: [PATCH] GESTrackAudioBackgroundSource -> GESTrackAudioTestSource --- docs/libs/ges-sections.txt | 26 +++++++------- ges/Makefile.am | 4 +-- ges/ges-timeline-background-source.c | 4 +-- ges/ges-timeline-title-source.c | 4 +-- ges/ges-track-audio-test-source.c | 51 ++++++++++++++-------------- ges/ges-track-audio-test-source.h | 40 +++++++++++----------- ges/ges-types.h | 6 ++-- ges/ges.h | 2 +- 8 files changed, 69 insertions(+), 68 deletions(-) diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt index ca94c77040..451307c9f4 100644 --- a/docs/libs/ges-sections.txt +++ b/docs/libs/ges-sections.txt @@ -398,7 +398,7 @@ GESTrackVideoTestSource GESTrackVideoTestSourceClass GESTrackVideoBgSrcPattern ges_track_video_test_source_new -ges_track_vbg_src_get_type +ges_track_video_test_source_get_type GES_IS_TRACK_VIDEO_TEST_SOURCE GES_IS_TRACK_VIDEO_TEST_SOURCE_CLASS @@ -409,22 +409,22 @@ GES_TYPE_TRACK_VIDEO_TEST_SOURCE
-ges-track-audio-background-source -GESTrackAudioBackgroundSource -GESTrackAudioBackgroundSource -GESTrackAudioBackgroundSourceClass -ges_track_audio_background_source_new -ges_track_abg_src_get_type +ges-track-audio-test-source +GESTrackAudioTestSource +GESTrackAudioTestSource +GESTrackAudioTestSourceClass +ges_track_audio_test_source_new +ges_track_audio_test_source_get_type DEFAULT_FONT_DESC DEFAULT_HALIGNMENT DEFAULT_VALIGNMENT -GES_TRACK_AUDIO_BACKGROUND_SOURCE -GES_TRACK_AUDIO_BACKGROUND_SOURCE_CLASS -GES_TRACK_AUDIO_BACKGROUND_SOURCE_GET_CLASS -GES_TYPE_TRACK_AUDIO_BACKGROUND_SOURCE -GES_IS_TRACK_AUDIO_BACKGROUND_SOURCE -GES_IS_TRACK_AUDIO_BACKGROUND_SOURCE_CLASS +GES_TRACK_AUDIO_TEST_SOURCE +GES_TRACK_AUDIO_TEST_SOURCE_CLASS +GES_TRACK_AUDIO_TEST_SOURCE_GET_CLASS +GES_TYPE_TRACK_AUDIO_TEST_SOURCE +GES_IS_TRACK_AUDIO_TEST_SOURCE +GES_IS_TRACK_AUDIO_TEST_SOURCE_CLASS
diff --git a/ges/Makefile.am b/ges/Makefile.am index bb30f3c772..8cb766218a 100644 --- a/ges/Makefile.am +++ b/ges/Makefile.am @@ -30,7 +30,7 @@ libges_@GST_MAJORMINOR@_la_SOURCES = \ ges-track-audio-transition.c \ ges-track-video-transition.c \ ges-track-video-test-source.c \ - ges-track-audio-background-source.c \ + ges-track-audio-test-source.c \ ges-track-title-source.c \ ges-track-text-overlay.c \ ges-utils.c @@ -61,7 +61,7 @@ libges_@GST_MAJORMINOR@include_HEADERS = \ ges-track-audio-transition.h \ ges-track-video-transition.h \ ges-track-video-test-source.h \ - ges-track-audio-background-source.h \ + ges-track-audio-test-source.h \ ges-track-title-source.h \ ges-track-text-overlay.h \ ges-utils.h diff --git a/ges/ges-timeline-background-source.c b/ges/ges-timeline-background-source.c index fc29fa0e47..e83d3d6c1b 100644 --- a/ges/ges-timeline-background-source.c +++ b/ges/ges-timeline-background-source.c @@ -31,7 +31,7 @@ #include "ges-timeline-source.h" #include "ges-track-object.h" #include "ges-track-video-test-source.h" -#include "ges-track-audio-background-source.h" +#include "ges-track-audio-test-source.h" #include G_DEFINE_TYPE (GESTimelineBackgroundSource, ges_tl_bg_src, @@ -233,7 +233,7 @@ ges_tl_bg_src_create_track_object (GESTimelineObject * obj, GESTrack * track) } else if (track->type == GES_TRACK_TYPE_AUDIO) { - res = (GESTrackObject *) ges_track_audio_background_source_new (); + res = (GESTrackObject *) ges_track_audio_test_source_new (); if (tfs->mute) ges_track_object_set_active (res, FALSE); } diff --git a/ges/ges-timeline-title-source.c b/ges/ges-timeline-title-source.c index 23caf69a8f..89e23bc27b 100644 --- a/ges/ges-timeline-title-source.c +++ b/ges/ges-timeline-title-source.c @@ -31,7 +31,7 @@ #include "ges-timeline-source.h" #include "ges-track-object.h" #include "ges-track-title-source.h" -#include "ges-track-audio-background-source.h" +#include "ges-track-audio-test-source.h" #include G_DEFINE_TYPE (GESTimelineTitleSource, ges_tl_title_src, @@ -391,7 +391,7 @@ ges_tl_title_src_create_track_object (GESTimelineObject * obj, GESTrack * track) } else if (track->type == GES_TRACK_TYPE_AUDIO) { - res = (GESTrackObject *) ges_track_audio_background_source_new (); + res = (GESTrackObject *) ges_track_audio_test_source_new (); if (tfs->mute) ges_track_object_set_active (res, FALSE); } diff --git a/ges/ges-track-audio-test-source.c b/ges/ges-track-audio-test-source.c index f6cace3314..119811b31a 100644 --- a/ges/ges-track-audio-test-source.c +++ b/ges/ges-track-audio-test-source.c @@ -19,15 +19,15 @@ */ /** - * SECTION:ges-track-audio-background-source + * SECTION:ges-track-audio-test-source * @short_description: Base Class for single-media sources */ #include "ges-internal.h" #include "ges-track-object.h" -#include "ges-track-audio-background-source.h" +#include "ges-track-audio-test-source.h" -G_DEFINE_TYPE (GESTrackAudioBackgroundSource, ges_track_abg_src, +G_DEFINE_TYPE (GESTrackAudioTestSource, ges_track_audio_test_source, GES_TYPE_TRACK_SOURCE); enum @@ -35,20 +35,21 @@ enum PROP_0, }; -static void ges_track_abg_src_dispose (GObject * object); +static void ges_track_audio_test_source_dispose (GObject * object); -static void ges_track_abg_src_finalize (GObject * object); +static void ges_track_audio_test_source_finalize (GObject * object); -static void ges_track_abg_src_get_property (GObject * object, guint +static void ges_track_audio_test_source_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); -static void ges_track_abg_src_set_property (GObject * object, guint +static void ges_track_audio_test_source_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); -static GstElement *ges_track_abg_src_create_element (GESTrackSource * self); +static GstElement *ges_track_audio_test_source_create_element (GESTrackSource * + self); static void -ges_track_abg_src_class_init (GESTrackAudioBackgroundSourceClass * klass) +ges_track_audio_test_source_class_init (GESTrackAudioTestSourceClass * klass) { GObjectClass *object_class; GESTrackSourceClass *bg_class; @@ -56,33 +57,33 @@ ges_track_abg_src_class_init (GESTrackAudioBackgroundSourceClass * klass) object_class = G_OBJECT_CLASS (klass); bg_class = GES_TRACK_SOURCE_CLASS (klass); - object_class->get_property = ges_track_abg_src_get_property; - object_class->set_property = ges_track_abg_src_set_property; - object_class->dispose = ges_track_abg_src_dispose; - object_class->finalize = ges_track_abg_src_finalize; + object_class->get_property = ges_track_audio_test_source_get_property; + object_class->set_property = ges_track_audio_test_source_set_property; + object_class->dispose = ges_track_audio_test_source_dispose; + object_class->finalize = ges_track_audio_test_source_finalize; - bg_class->create_element = ges_track_abg_src_create_element; + bg_class->create_element = ges_track_audio_test_source_create_element; } static void -ges_track_abg_src_init (GESTrackAudioBackgroundSource * self) +ges_track_audio_test_source_init (GESTrackAudioTestSource * self) { } static void -ges_track_abg_src_dispose (GObject * object) +ges_track_audio_test_source_dispose (GObject * object) { - G_OBJECT_CLASS (ges_track_abg_src_parent_class)->dispose (object); + G_OBJECT_CLASS (ges_track_audio_test_source_parent_class)->dispose (object); } static void -ges_track_abg_src_finalize (GObject * object) +ges_track_audio_test_source_finalize (GObject * object) { - G_OBJECT_CLASS (ges_track_abg_src_parent_class)->finalize (object); + G_OBJECT_CLASS (ges_track_audio_test_source_parent_class)->finalize (object); } static void -ges_track_abg_src_get_property (GObject * object, +ges_track_audio_test_source_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { switch (property_id) { @@ -92,7 +93,7 @@ ges_track_abg_src_get_property (GObject * object, } static void -ges_track_abg_src_set_property (GObject * object, +ges_track_audio_test_source_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { switch (property_id) { @@ -102,7 +103,7 @@ ges_track_abg_src_set_property (GObject * object, } static GstElement * -ges_track_abg_src_create_element (GESTrackSource * self) +ges_track_audio_test_source_create_element (GESTrackSource * self) { GstElement *ret; ret = gst_element_factory_make ("audiotestsrc", NULL); @@ -110,8 +111,8 @@ ges_track_abg_src_create_element (GESTrackSource * self) return ret; } -GESTrackAudioBackgroundSource * -ges_track_audio_background_source_new (void) +GESTrackAudioTestSource * +ges_track_audio_test_source_new (void) { - return g_object_new (GES_TYPE_TRACK_AUDIO_BACKGROUND_SOURCE, NULL); + return g_object_new (GES_TYPE_TRACK_AUDIO_TEST_SOURCE, NULL); } diff --git a/ges/ges-track-audio-test-source.h b/ges/ges-track-audio-test-source.h index 2d9ba807b2..c6941d9d9a 100644 --- a/ges/ges-track-audio-test-source.h +++ b/ges/ges-track-audio-test-source.h @@ -18,8 +18,8 @@ * Boston, MA 02111-1307, USA. */ -#ifndef _GES_TRACK_AUDIO_BACKGROUND_SOURCE -#define _GES_TRACK_AUDIO_BACKGROUND_SOURCE +#ifndef _GES_TRACK_AUDIO_TEST_SOURCE +#define _GES_TRACK_AUDIO_TEST_SOURCE #include #include @@ -27,52 +27,52 @@ G_BEGIN_DECLS -#define GES_TYPE_TRACK_AUDIO_BACKGROUND_SOURCE ges_track_abg_src_get_type() +#define GES_TYPE_TRACK_AUDIO_TEST_SOURCE ges_track_audio_test_source_get_type() -#define GES_TRACK_AUDIO_BACKGROUND_SOURCE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRACK_AUDIO_BACKGROUND_SOURCE, GESTrackAudioBackgroundSource)) +#define GES_TRACK_AUDIO_TEST_SOURCE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRACK_AUDIO_TEST_SOURCE, GESTrackAudioTestSource)) -#define GES_TRACK_AUDIO_BACKGROUND_SOURCE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRACK_AUDIO_BACKGROUND_SOURCE, GESTrackAudioBackgroundSourceClass)) +#define GES_TRACK_AUDIO_TEST_SOURCE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRACK_AUDIO_TEST_SOURCE, GESTrackAudioTestSourceClass)) -#define GES_IS_TRACK_AUDIO_BACKGROUND_SOURCE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRACK_AUDIO_BACKGROUND_SOURCE)) +#define GES_IS_TRACK_AUDIO_TEST_SOURCE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRACK_AUDIO_TEST_SOURCE)) -#define GES_IS_TRACK_AUDIO_BACKGROUND_SOURCE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRACK_AUDIO_BACKGROUND_SOURCE)) +#define GES_IS_TRACK_AUDIO_TEST_SOURCE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRACK_AUDIO_TEST_SOURCE)) -#define GES_TRACK_AUDIO_BACKGROUND_SOURCE_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_AUDIO_BACKGROUND_SOURCE, GESTrackAudioBackgroundSourceClass)) +#define GES_TRACK_AUDIO_TEST_SOURCE_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_AUDIO_TEST_SOURCE, GESTrackAudioTestSourceClass)) /** - * GESTrackAudioBackgroundSource: + * GESTrackAudioTestSource: * @parent: parent * */ -struct _GESTrackAudioBackgroundSource { +struct _GESTrackAudioTestSource { GESTrackSource parent; /*< public >*/ }; /** - * GESTrackAudioBackgroundSourceClass: + * GESTrackAudioTestSourceClass: * @parent_class: parent class * */ -struct _GESTrackAudioBackgroundSourceClass { +struct _GESTrackAudioTestSourceClass { GESTrackSourceClass parent_class; /*< public >*/ }; -GType ges_track_abg_src_get_type (void); +GType ges_track_audio_test_source_get_type (void); -GESTrackAudioBackgroundSource* ges_track_audio_background_source_new (void); +GESTrackAudioTestSource* ges_track_audio_test_source_new (void); G_END_DECLS -#endif /* _GES_TRACK_AUDIO_BACKGROUND_SOURCE */ +#endif /* _GES_TRACK_AUDIO_TEST_SOURCE */ diff --git a/ges/ges-types.h b/ges/ges-types.h index c203636451..27c6343c1c 100644 --- a/ges/ges-types.h +++ b/ges/ges-types.h @@ -87,9 +87,9 @@ typedef struct _GESTrackVideoTestSource GESTrackVideoTestSource; typedef struct _GESTrackVideoTestSourceClass GESTrackVideoTestSourceClass; -typedef struct _GESTrackAudioBackgroundSource GESTrackAudioBackgroundSource; -typedef struct _GESTrackAudioBackgroundSourceClass - GESTrackAudioBackgroundSourceClass; +typedef struct _GESTrackAudioTestSource GESTrackAudioTestSource; +typedef struct _GESTrackAudioTestSourceClass + GESTrackAudioTestSourceClass; typedef struct _GESTrackTitleSource GESTrackTitleSource; typedef struct _GESTrackTitleSourceClass diff --git a/ges/ges.h b/ges/ges.h index ce634c4f9a..a85bfa404c 100644 --- a/ges/ges.h +++ b/ges/ges.h @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include