From 4c91a36f9ab3679a23043d34de70a8344816f6ab Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Sat, 4 Dec 2010 19:54:13 +0100 Subject: [PATCH] ges: Add instance private structures --- docs/libs/ges-sections.txt | 20 ++++++++++++++++++++ ges/ges-timeline-layer.c | 11 +++++++++++ ges/ges-timeline-layer.h | 4 ++++ ges/ges-timeline-overlay.c | 10 ++++++++++ ges/ges-timeline-overlay.h | 5 +++++ ges/ges-timeline-source.c | 13 ++++++++++++- ges/ges-timeline-source.h | 4 ++++ ges/ges-timeline-test-source.c | 11 +++++++++++ ges/ges-timeline-test-source.h | 4 ++++ ges/ges-timeline-text-overlay.c | 12 ++++++++++++ ges/ges-timeline-text-overlay.h | 4 ++++ ges/ges-timeline-title-source.c | 11 +++++++++++ ges/ges-timeline-title-source.h | 4 ++++ ges/ges-timeline-transition.c | 11 +++++++++++ ges/ges-timeline-transition.h | 4 ++++ ges/ges-track-audio-test-source.c | 11 +++++++++++ ges/ges-track-audio-test-source.h | 4 ++++ ges/ges-track-audio-transition.c | 12 ++++++++++++ ges/ges-track-audio-transition.h | 4 ++++ ges/ges-track-filesource.c | 10 ++++++++++ ges/ges-track-filesource.h | 5 +++++ ges/ges-track-image-source.c | 10 ++++++++++ ges/ges-track-image-source.h | 5 +++++ ges/ges-track-object.c | 13 ++++++++++++- ges/ges-track-object.h | 4 ++++ ges/ges-track-operation.c | 10 ++++++++++ ges/ges-track-operation.h | 4 ++++ ges/ges-track-source.c | 10 ++++++++++ ges/ges-track-source.h | 4 ++++ ges/ges-track-text-overlay.c | 11 +++++++++++ ges/ges-track-text-overlay.h | 4 ++++ ges/ges-track-title-source.c | 11 +++++++++++ ges/ges-track-title-source.h | 4 ++++ ges/ges-track-transition.c | 11 +++++++++++ ges/ges-track-transition.h | 4 ++++ ges/ges-track-video-test-source.c | 11 +++++++++++ ges/ges-track-video-test-source.h | 4 ++++ ges/ges-track-video-transition.c | 11 +++++++++++ ges/ges-track-video-transition.h | 4 ++++ ges/ges-track.c | 11 +++++++++++ ges/ges-track.h | 4 ++++ 41 files changed, 322 insertions(+), 2 deletions(-) diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt index 4ba2eea27b..212e38c821 100644 --- a/docs/libs/ges-sections.txt +++ b/docs/libs/ges-sections.txt @@ -47,6 +47,7 @@ ges_track_add_object ges_track_remove_object ges_track_set_caps +GESTrackPrivate ges_track_set_timeline ges_track_get_type GES_IS_TRACK @@ -69,6 +70,7 @@ GES_TRACK_OBJECT_PRIORITY_OFFSET GES_TRACK_OBJECT_START ges_track_object_set_active +GESTrackObjectPrivate ges_track_object_set_timeline_object ges_track_object_set_track ges_track_object_set_duration_internal @@ -92,6 +94,7 @@ GESTrackSource GESTrackSourceClass ges_track_source_new +GESTrackSourcePrivate GES_TRACK_SOURCE GES_TRACK_SOURCE_CLASS GES_TRACK_SOURCE_GET_CLASS @@ -108,6 +111,7 @@ GESTrackOperation GESTrackOperationClass ges_track_operation_new +GESTrackOperationPrivate ges_track_operation_get_type GES_IS_TRACK_OPERATION GES_IS_TRACK_OPERATION_CLASS @@ -124,6 +128,7 @@ GESTrackFileSource GESTrackFileSourceClass ges_track_filesource_new +GESTrackFileSourcePrivate GES_TRACK_FILESOURCE GES_TRACK_FILESOURCE_CLASS GES_TRACK_FILESOURCE_GET_CLASS @@ -139,6 +144,7 @@ ges_track_filesource_get_type GESTrackImageSource GESTrackImageSourceClass +GESTrackImageSourcePrivate GES_IS_TRACK_IMAGE_SOURCE GES_IS_TRACK_IMAGE_SOURCE_CLASS GES_TRACK_IMAGE_SOURCE @@ -155,6 +161,7 @@ ges_track_image_source_new GESTrackTransition GESTrackTransitionClass +GESTrackTransitionPrivate GES_IS_TRACK_TRANSITION GES_IS_TRACK_TRANSITION_CLASS GES_TRACK_TRANSITION @@ -171,6 +178,7 @@ GESTrackAudioTransition GESTrackAudioTransitionClass ges_track_audio_transition_new +GESTrackAudioTransitionPrivate GES_IS_TRACK_AUDIO_TRANSITION ges_track_audio_transition_get_type GES_IS_TRACK_AUDIO_TRANSITION_CLASS @@ -188,6 +196,7 @@ GESTrackVideoTransitionClass ges_track_video_transition_new ges_track_video_transition_set_type +GESTrackVideoTransitionPrivate ges_track_video_transition_get_type GES_IS_TRACK_VIDEO_TRANSITION GES_IS_TRACK_VIDEO_TRANSITION_CLASS @@ -235,6 +244,7 @@ ges_timeline_layer_remove_object ges_timeline_layer_set_priority ges_timeline_layer_get_objects +GESTimelineLayerPrivate ges_timeline_layer_set_timeline ges_timeline_layer_get_type GES_IS_TIMELINE_LAYER @@ -313,6 +323,7 @@ GESTimelineSource GESTimelineSourceClass ges_timeline_source_new +GESTimelineSourcePrivate ges_timeline_source_get_type GES_IS_TIMELINE_SOURCE GES_IS_TIMELINE_SOURCE_CLASS @@ -344,6 +355,7 @@ GES_TYPE_TIMELINE_FILE_SOURCE GESTimelineOverlay GESTimelineOverlayClass +GESTimelineOverlayPrivate ges_timeline_overlay_get_type GES_IS_TIMELINE_OVERLAY GES_IS_TIMELINE_OVERLAY_CLASS @@ -361,6 +373,7 @@ GESTimelineTransitionClass ges_timeline_transition_new ges_timeline_transition_new_for_nick +GESTimelineTransitionPrivate GES_IS_TIMELINE_TRANSITION GES_IS_TIMELINE_TRANSITION_CLASS GES_TIMELINE_TRANSITION @@ -415,6 +428,7 @@ GESTimelineTestSourceClass ges_timeline_test_source_new ges_timeline_test_source_new_for_nick +GESTimelineTestSourcePrivate ges_timeline_test_source_get_type GES_TYPE_TIMELINE_TEST_SOURCE GES_IS_TIMELINE_TEST_SOURCE @@ -431,6 +445,7 @@ GESTimelineTitleSource GESTimelineTitleSourceClass ges_timeline_title_source_new +GESTimelineTitleSourcePrivate ges_tl_title_src_get_type GES_IS_TIMELINE_TITLE_SOURCE GES_IS_TIMELINE_TITLE_SOURCE_CLASS @@ -446,6 +461,7 @@ GESTimelineTextOverlay GESTimelineTextOverlayClass ges_timeline_text_overlay_new +GESTimelineTextOverlayPrivate ges_tl_text_overlay_get_type GES_IS_TIMELINE_TEXT_OVERLAY GES_IS_TIMELINE_TEXT_OVERLAY_CLASS @@ -463,6 +479,7 @@ GESTrackVideoTestSourceClass ges_track_video_test_source_new ges_track_video_test_source_set_pattern +GESTrackVideoTestSourcePrivate ges_track_video_test_source_get_type GES_IS_TRACK_VIDEO_TEST_SOURCE GES_IS_TRACK_VIDEO_TEST_SOURCE_CLASS @@ -481,6 +498,7 @@ ges_track_audio_test_source_new ges_track_audio_test_source_set_freq ges_track_audio_test_source_set_volume +GESTrackAudioTestSourcePrivate ges_track_audio_test_source_get_type GES_TRACK_AUDIO_TEST_SOURCE GES_TRACK_AUDIO_TEST_SOURCE_CLASS @@ -502,6 +520,7 @@ ges_track_title_source_set_halignment ges_track_title_source_set_valignment ges_track_title_source_new +GESTrackTitleSourcePrivate ges_track_title_src_get_type GES_TRACK_TITLE_SOURCE GES_TRACK_TITLE_SOURCE_CLASS @@ -523,6 +542,7 @@ ges_track_text_overlay_set_halignment ges_track_text_overlay_set_text ges_track_text_overlay_set_valignment +GESTrackTextOverlayPrivate ges_track_text_overlay_get_type GES_IS_TRACK_TEXT_OVERLAY GES_IS_TRACK_TEXT_OVERLAY_CLASS diff --git a/ges/ges-timeline-layer.c b/ges/ges-timeline-layer.c index 23a978dca3..b9e0e4aa25 100644 --- a/ges/ges-timeline-layer.c +++ b/ges/ges-timeline-layer.c @@ -35,6 +35,12 @@ G_DEFINE_TYPE (GESTimelineLayer, ges_timeline_layer, G_TYPE_OBJECT); +struct _GESTimelineLayerPrivate +{ + /* Dummy variable */ + void *nothing; +}; + enum { PROP_0, @@ -108,6 +114,8 @@ ges_timeline_layer_class_init (GESTimelineLayerClass * klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); + g_type_class_add_private (klass, sizeof (GESTimelineLayerPrivate)); + object_class->get_property = ges_timeline_layer_get_property; object_class->set_property = ges_timeline_layer_set_property; object_class->dispose = ges_timeline_layer_dispose; @@ -156,6 +164,9 @@ ges_timeline_layer_class_init (GESTimelineLayerClass * klass) static void ges_timeline_layer_init (GESTimelineLayer * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TIMELINE_LAYER, GESTimelineLayerPrivate); + /* TODO : Keep those 3 values in sync */ self->priority = 0; self->min_gnl_priority = 0; diff --git a/ges/ges-timeline-layer.h b/ges/ges-timeline-layer.h index 6983ca4840..b527ffbf8e 100644 --- a/ges/ges-timeline-layer.h +++ b/ges/ges-timeline-layer.h @@ -43,6 +43,8 @@ G_BEGIN_DECLS #define GES_TIMELINE_LAYER_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_LAYER, GESTimelineLayerClass)) +typedef struct _GESTimelineLayerPrivate GESTimelineLayerPrivate; + /** * GESTimelineLayer: * @timeline: the #GESTimeline where this layer is being used. @@ -63,6 +65,8 @@ struct _GESTimelineLayer { guint32 min_gnl_priority, max_gnl_priority; + GESTimelineLayerPrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-timeline-overlay.c b/ges/ges-timeline-overlay.c index 55835bbc7a..23ebc51da7 100644 --- a/ges/ges-timeline-overlay.c +++ b/ges/ges-timeline-overlay.c @@ -37,6 +37,12 @@ G_DEFINE_TYPE (GESTimelineOverlay, ges_timeline_overlay, GES_TYPE_TIMELINE_OBJECT); +struct _GESTimelineOverlayPrivate +{ + /* Dummy variable */ + void *nothing; +}; + static void ges_timeline_overlay_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) @@ -74,6 +80,8 @@ ges_timeline_overlay_class_init (GESTimelineOverlayClass * klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); + g_type_class_add_private (klass, sizeof (GESTimelineOverlayPrivate)); + object_class->get_property = ges_timeline_overlay_get_property; object_class->set_property = ges_timeline_overlay_set_property; object_class->dispose = ges_timeline_overlay_dispose; @@ -83,4 +91,6 @@ ges_timeline_overlay_class_init (GESTimelineOverlayClass * klass) static void ges_timeline_overlay_init (GESTimelineOverlay * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TIMELINE_OVERLAY, GESTimelineOverlayPrivate); } diff --git a/ges/ges-timeline-overlay.h b/ges/ges-timeline-overlay.h index ae9c3b7dab..11387ced09 100644 --- a/ges/ges-timeline-overlay.h +++ b/ges/ges-timeline-overlay.h @@ -44,6 +44,8 @@ G_BEGIN_DECLS #define GES_TIMELINE_OVERLAY_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_OVERLAY, GESTimelineOverlayClass)) +typedef struct _GESTimelineOverlayPrivate GESTimelineOverlayPrivate; + /** * GESTimelineOverlay: */ @@ -52,6 +54,9 @@ struct _GESTimelineOverlay { GESTimelineObject parent; /*< private >*/ + + GESTimelineOverlayPrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-timeline-source.c b/ges/ges-timeline-source.c index 4792b56eae..83a08c21d0 100644 --- a/ges/ges-timeline-source.c +++ b/ges/ges-timeline-source.c @@ -35,7 +35,13 @@ #define DEFAULT_PROP_FONT_DESC "Serif 36" #define DEFAULT_PROP_VALIGNMENT GES_TEXT_VALIGN_BASELINE #define DEFAULT_PROP_HALIGNMENT GES_TEXT_HALIGN_CENTER -# + +struct _GESTimelineSourcePrivate +{ + /* dummy variable */ + void *nothing; +}; + enum { PROP_0, @@ -140,6 +146,8 @@ ges_timeline_source_class_init (GESTimelineSourceClass * klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GESTimelineObjectClass *timobj_class = GES_TIMELINE_OBJECT_CLASS (klass); + g_type_class_add_private (klass, sizeof (GESTimelineSourcePrivate)); + object_class->get_property = ges_timeline_source_get_property; object_class->set_property = ges_timeline_source_set_property; object_class->dispose = ges_timeline_source_dispose; @@ -198,6 +206,9 @@ ges_timeline_source_class_init (GESTimelineSourceClass * klass) static void ges_timeline_source_init (GESTimelineSource * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TIMELINE_SOURCE, GESTimelineSourcePrivate); + self->halign = DEFAULT_PROP_HALIGNMENT; self->valign = DEFAULT_PROP_VALIGNMENT; } diff --git a/ges/ges-timeline-source.h b/ges/ges-timeline-source.h index 5510d190b9..51102fc31e 100644 --- a/ges/ges-timeline-source.h +++ b/ges/ges-timeline-source.h @@ -45,6 +45,8 @@ G_BEGIN_DECLS #define GES_TIMELINE_SOURCE_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_SOURCE, GESTimelineSourceClass)) +typedef struct _GESTimelineSourcePrivate GESTimelineSourcePrivate; + /** * GESTimelineSource: * @@ -59,6 +61,8 @@ struct _GESTimelineSource { GESTextHAlign halign; GESTextVAlign valign; + GESTimelineSourcePrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-timeline-test-source.c b/ges/ges-timeline-test-source.c index d23fd9b0db..68ec98481d 100644 --- a/ges/ges-timeline-test-source.c +++ b/ges/ges-timeline-test-source.c @@ -38,6 +38,12 @@ G_DEFINE_TYPE (GESTimelineTestSource, ges_timeline_test_source, GES_TYPE_TIMELINE_SOURCE); +struct _GESTimelineTestSourcePrivate +{ + /* Dummy variable */ + void *nothing; +}; + enum { PROP_0, @@ -131,6 +137,8 @@ ges_timeline_test_source_class_init (GESTimelineTestSourceClass * klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GESTimelineObjectClass *timobj_class = GES_TIMELINE_OBJECT_CLASS (klass); + g_type_class_add_private (klass, sizeof (GESTimelineTestSourcePrivate)); + object_class->get_property = ges_timeline_test_source_get_property; object_class->set_property = ges_timeline_test_source_set_property; object_class->dispose = ges_timeline_test_source_dispose; @@ -185,6 +193,9 @@ ges_timeline_test_source_class_init (GESTimelineTestSourceClass * klass) static void ges_timeline_test_source_init (GESTimelineTestSource * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TIMELINE_TEST_SOURCE, GESTimelineTestSourcePrivate); + self->freq = 0; self->volume = 0; GES_TIMELINE_OBJECT (self)->duration = 0; diff --git a/ges/ges-timeline-test-source.h b/ges/ges-timeline-test-source.h index fc87d53516..5b1bf8641b 100644 --- a/ges/ges-timeline-test-source.h +++ b/ges/ges-timeline-test-source.h @@ -46,6 +46,8 @@ G_BEGIN_DECLS #define GES_TIMELINE_TEST_SOURCE_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_TEST_SOURCE, GESTimelineTestSourceClass)) +typedef struct _GESTimelineTestSourcePrivate GESTimelineTestSourcePrivate; + /** * GESTimelineTestSource: * @@ -59,6 +61,8 @@ struct _GESTimelineTestSource { GESVideoTestPattern vpattern; gdouble freq; gdouble volume; + + GESTimelineTestSourcePrivate *priv; /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; diff --git a/ges/ges-timeline-text-overlay.c b/ges/ges-timeline-text-overlay.c index 6ed3c1bf48..16fc303740 100644 --- a/ges/ges-timeline-text-overlay.c +++ b/ges/ges-timeline-text-overlay.c @@ -39,6 +39,13 @@ G_DEFINE_TYPE (GESTimelineTextOverlay, ges_tl_text_overlay, #define DEFAULT_PROP_VALIGNMENT GES_TEXT_VALIGN_BASELINE #define DEFAULT_PROP_HALIGNMENT GES_TEXT_HALIGN_CENTER # + +struct _GESTimelineTextOverlayPrivate +{ + /* Dummy variable */ + void *nothing; +}; + enum { PROP_0, @@ -142,6 +149,8 @@ ges_tl_text_overlay_class_init (GESTimelineTextOverlayClass * klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GESTimelineObjectClass *timobj_class = GES_TIMELINE_OBJECT_CLASS (klass); + g_type_class_add_private (klass, sizeof (GESTimelineTextOverlayPrivate)); + object_class->get_property = ges_tl_text_overlay_get_property; object_class->set_property = ges_tl_text_overlay_set_property; object_class->dispose = ges_tl_text_overlay_dispose; @@ -198,6 +207,9 @@ ges_tl_text_overlay_class_init (GESTimelineTextOverlayClass * klass) static void ges_tl_text_overlay_init (GESTimelineTextOverlay * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TIMELINE_TEXT_OVERLAY, GESTimelineTextOverlayPrivate); + GES_TIMELINE_OBJECT (self)->duration = 0; /* Not 100% needed since gobject contents are memzero'd when created */ self->text = NULL; diff --git a/ges/ges-timeline-text-overlay.h b/ges/ges-timeline-text-overlay.h index f74cb8166b..1fbee557f2 100644 --- a/ges/ges-timeline-text-overlay.h +++ b/ges/ges-timeline-text-overlay.h @@ -45,6 +45,8 @@ G_BEGIN_DECLS #define GES_TIMELINE_TEXT_OVERLAY_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_TEXT_OVERLAY, GESTimelineTextOverlayClass)) +typedef struct _GESTimelineTextOverlayPrivate GESTimelineTextOverlayPrivate; + /** * GESTimelineTextOverlay: * @@ -60,6 +62,8 @@ struct _GESTimelineTextOverlay { GESTextHAlign halign; GESTextVAlign valign; + GESTimelineTextOverlayPrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-timeline-title-source.c b/ges/ges-timeline-title-source.c index bf201ccaed..a9d9789d2c 100644 --- a/ges/ges-timeline-title-source.c +++ b/ges/ges-timeline-title-source.c @@ -44,6 +44,12 @@ G_DEFINE_TYPE (GESTimelineTitleSource, ges_tl_title_src, #define GES_TIMELINE_TITLE_SRC_VALIGN_TYPE (ges_timeline_title_source_valign_get_type()) #define GES_TIMELINE_TITLE_SRC_HALIGN_TYPE (ges_timeline_title_source_halign_get_type()) +struct _GESTimelineTitleSourcePrivate +{ + /* Dummy variable */ + void *nothing; +}; + enum { PROP_0, @@ -154,6 +160,8 @@ ges_tl_title_src_class_init (GESTimelineTitleSourceClass * klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GESTimelineObjectClass *timobj_class = GES_TIMELINE_OBJECT_CLASS (klass); + g_type_class_add_private (klass, sizeof (GESTimelineTitleSourcePrivate)); + object_class->get_property = ges_tl_title_src_get_property; object_class->set_property = ges_tl_title_src_set_property; object_class->dispose = ges_tl_title_src_dispose; @@ -216,6 +224,9 @@ ges_tl_title_src_class_init (GESTimelineTitleSourceClass * klass) static void ges_tl_title_src_init (GESTimelineTitleSource * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TIMELINE_TITLE_SOURCE, GESTimelineTitleSourcePrivate); + GES_TIMELINE_OBJECT (self)->duration = 0; /* Not 100% required since a new gobject's content will always be memzero'd */ self->mute = FALSE; diff --git a/ges/ges-timeline-title-source.h b/ges/ges-timeline-title-source.h index 86f1b138ca..fa086d0862 100644 --- a/ges/ges-timeline-title-source.h +++ b/ges/ges-timeline-title-source.h @@ -45,6 +45,8 @@ G_BEGIN_DECLS #define GES_TIMELINE_TITLE_SOURCE_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_TITLE_SOURCE, GESTimelineTitleSourceClass)) +typedef struct _GESTimelineTitleSourcePrivate GESTimelineTitleSourcePrivate; + /** * GESTimelineTitleSource: * @@ -60,6 +62,8 @@ struct _GESTimelineTitleSource { GESTextVAlign halign; GESTextHAlign valign; + GESTimelineTitleSourcePrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-timeline-transition.c b/ges/ges-timeline-transition.c index 039f9c7abf..6f75eb3c2b 100644 --- a/ges/ges-timeline-transition.c +++ b/ges/ges-timeline-transition.c @@ -42,6 +42,11 @@ #include "ges-track-video-transition.h" #include "ges-track-audio-transition.h" +struct _GESTimelineTransitionPrivate +{ + /* Dummy variable */ + void *nothing; +}; enum { @@ -122,6 +127,8 @@ ges_timeline_transition_class_init (GESTimelineTransitionClass * klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GESTimelineObjectClass *timobj_class = GES_TIMELINE_OBJECT_CLASS (klass); + g_type_class_add_private (klass, sizeof (GESTimelineTransitionPrivate)); + object_class->get_property = ges_timeline_transition_get_property; object_class->set_property = ges_timeline_transition_set_property; object_class->dispose = ges_timeline_transition_dispose; @@ -146,6 +153,10 @@ ges_timeline_transition_class_init (GESTimelineTransitionClass * klass) static void ges_timeline_transition_init (GESTimelineTransition * self) { + + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TIMELINE_TRANSITION, GESTimelineTransitionPrivate); + self->vtype = GES_VIDEO_TRANSITION_TYPE_NONE; } diff --git a/ges/ges-timeline-transition.h b/ges/ges-timeline-transition.h index 1073ab9db1..6006da9746 100644 --- a/ges/ges-timeline-transition.h +++ b/ges/ges-timeline-transition.h @@ -43,6 +43,8 @@ G_BEGIN_DECLS #define GES_TIMELINE_TRANSITION_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_TRANSITION, GESTimelineTransitionClass)) +typedef struct _GESTimelineTransitionPrivate GESTimelineTransitionPrivate; + /** * GESTimelineTransition: * @vtype: a #GESVideoTransitionType indicating the type of video transition @@ -56,6 +58,8 @@ struct _GESTimelineTransition { GESVideoTransitionType vtype; /*< private >*/ + GESTimelineTransitionPrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-track-audio-test-source.c b/ges/ges-track-audio-test-source.c index 929c1cee54..5c0e6f9cca 100644 --- a/ges/ges-track-audio-test-source.c +++ b/ges/ges-track-audio-test-source.c @@ -34,6 +34,12 @@ G_DEFINE_TYPE (GESTrackAudioTestSource, ges_track_audio_test_source, GES_TYPE_TRACK_SOURCE); +struct _GESTrackAudioTestSourcePrivate +{ + /* Dummy variable */ + void *nothing; +}; + enum { PROP_0, @@ -58,6 +64,8 @@ ges_track_audio_test_source_class_init (GESTrackAudioTestSourceClass * klass) GObjectClass *object_class; GESTrackSourceClass *bg_class; + g_type_class_add_private (klass, sizeof (GESTrackAudioTestSourcePrivate)); + object_class = G_OBJECT_CLASS (klass); bg_class = GES_TRACK_SOURCE_CLASS (klass); @@ -72,6 +80,9 @@ ges_track_audio_test_source_class_init (GESTrackAudioTestSourceClass * klass) static void ges_track_audio_test_source_init (GESTrackAudioTestSource * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TRACK_AUDIO_TEST_SOURCE, GESTrackAudioTestSourcePrivate); + self->freq = 440; self->volume = 0; } diff --git a/ges/ges-track-audio-test-source.h b/ges/ges-track-audio-test-source.h index 8b6525ae0d..5d6065fa8d 100644 --- a/ges/ges-track-audio-test-source.h +++ b/ges/ges-track-audio-test-source.h @@ -44,6 +44,8 @@ G_BEGIN_DECLS #define GES_TRACK_AUDIO_TEST_SOURCE_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_AUDIO_TEST_SOURCE, GESTrackAudioTestSourceClass)) +typedef struct _GESTrackAudioTestSourcePrivate GESTrackAudioTestSourcePrivate; + /** * GESTrackAudioTestSource: * @@ -56,6 +58,8 @@ struct _GESTrackAudioTestSource { gdouble freq; gdouble volume; + GESTrackAudioTestSourcePrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-track-audio-transition.c b/ges/ges-track-audio-transition.c index 901092f841..24e0adb203 100644 --- a/ges/ges-track-audio-transition.c +++ b/ges/ges-track-audio-transition.c @@ -30,6 +30,12 @@ G_DEFINE_TYPE (GESTrackAudioTransition, ges_track_audio_transition, GES_TYPE_TRACK_TRANSITION); +struct _GESTrackAudioTransitionPrivate +{ + /* Dummy variable */ + void *nothing; +}; + enum { PROP_0, @@ -61,6 +67,8 @@ ges_track_audio_transition_class_init (GESTrackAudioTransitionClass * klass) GESTrackObjectClass *toclass; GESTrackTransitionClass *pclass; + g_type_class_add_private (klass, sizeof (GESTrackAudioTransitionPrivate)); + object_class = G_OBJECT_CLASS (klass); toclass = GES_TRACK_OBJECT_CLASS (klass); pclass = GES_TRACK_TRANSITION_CLASS (klass); @@ -79,6 +87,10 @@ ges_track_audio_transition_class_init (GESTrackAudioTransitionClass * klass) static void ges_track_audio_transition_init (GESTrackAudioTransition * self) { + + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TRACK_AUDIO_TRANSITION, GESTrackAudioTransitionPrivate); + self->a_controller = NULL; self->a_control_source = NULL; diff --git a/ges/ges-track-audio-transition.h b/ges/ges-track-audio-transition.h index 1faac92d55..5098308042 100644 --- a/ges/ges-track-audio-transition.h +++ b/ges/ges-track-audio-transition.h @@ -44,6 +44,8 @@ G_BEGIN_DECLS #define GES_TRACK_AUDIO_TRANSITION_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_AUDIO_TRANSITION, GESTrackAudioTransitionClass)) +typedef struct _GESTrackAudioTransitionPrivate GESTrackAudioTransitionPrivate; + /** * GESTrackAudioTransition: * @@ -61,6 +63,8 @@ struct _GESTrackAudioTransition { GstController *b_controller; GstInterpolationControlSource *b_control_source; + GESTrackAudioTransitionPrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-track-filesource.c b/ges/ges-track-filesource.c index 4ddb80b7ca..cb7f45a0b6 100644 --- a/ges/ges-track-filesource.c +++ b/ges/ges-track-filesource.c @@ -32,6 +32,12 @@ G_DEFINE_TYPE (GESTrackFileSource, ges_track_filesource, GES_TYPE_TRACK_SOURCE); +struct _GESTrackFileSourcePrivate +{ + /* Dummy variable */ + void *nothing; +}; + enum { PROP_0, @@ -101,6 +107,8 @@ ges_track_filesource_class_init (GESTrackFileSourceClass * klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GESTrackObjectClass *track_class = GES_TRACK_OBJECT_CLASS (klass); + g_type_class_add_private (klass, sizeof (GESTrackFileSourcePrivate)); + object_class->get_property = ges_track_filesource_get_property; object_class->set_property = ges_track_filesource_set_property; object_class->dispose = ges_track_filesource_dispose; @@ -120,6 +128,8 @@ ges_track_filesource_class_init (GESTrackFileSourceClass * klass) static void ges_track_filesource_init (GESTrackFileSource * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TRACK_FILESOURCE, GESTrackFileSourcePrivate); } GESTrackFileSource * diff --git a/ges/ges-track-filesource.h b/ges/ges-track-filesource.h index b859258286..5192c8bc33 100644 --- a/ges/ges-track-filesource.h +++ b/ges/ges-track-filesource.h @@ -43,6 +43,9 @@ G_BEGIN_DECLS #define GES_TRACK_FILESOURCE_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_FILESOURCE, GESTrackFileSourceClass)) + +typedef struct _GESTrackFileSourcePrivate GESTrackFileSourcePrivate; + /** * GESTrackFileSource: * @uri: #gchar *, the URI of the media file to play @@ -55,6 +58,8 @@ struct _GESTrackFileSource { gchar *uri; /*< private >*/ + GESTrackFileSourcePrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-track-image-source.c b/ges/ges-track-image-source.c index 9f09ba3dac..1cabba4853 100644 --- a/ges/ges-track-image-source.c +++ b/ges/ges-track-image-source.c @@ -35,6 +35,12 @@ G_DEFINE_TYPE (GESTrackImageSource, ges_track_image_source, GES_TYPE_TRACK_SOURCE); +struct _GESTrackImageSourcePrivate +{ + /* Dummy variable */ + void *nothing; +}; + enum { PROP_0, @@ -153,6 +159,8 @@ ges_track_image_source_class_init (GESTrackImageSourceClass * klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GESTrackSourceClass *source_class = GES_TRACK_SOURCE_CLASS (klass); + g_type_class_add_private (klass, sizeof (GESTrackImageSourcePrivate)); + object_class->get_property = ges_track_image_source_get_property; object_class->set_property = ges_track_image_source_set_property; object_class->dispose = ges_track_image_source_dispose; @@ -172,6 +180,8 @@ ges_track_image_source_class_init (GESTrackImageSourceClass * klass) static void ges_track_image_source_init (GESTrackImageSource * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TRACK_IMAGE_SOURCE, GESTrackImageSourcePrivate); } GESTrackImageSource * diff --git a/ges/ges-track-image-source.h b/ges/ges-track-image-source.h index b7a9feec0d..93ca2f9fb2 100644 --- a/ges/ges-track-image-source.h +++ b/ges/ges-track-image-source.h @@ -43,6 +43,9 @@ G_BEGIN_DECLS #define GES_TRACK_IMAGE_SOURCE_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_IMAGE_SOURCE, GESTrackImageSourceClass)) + +typedef struct _GESTrackImageSourcePrivate GESTrackImageSourcePrivate; + /** * GESTrackImageSource: * @uri: #gchar *, the URI of the media file to play @@ -54,6 +57,8 @@ struct _GESTrackImageSource { /*< public >*/ gchar *uri; + GESTrackImageSourcePrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-track-object.c b/ges/ges-track-object.c index 67bb781315..3ad848e136 100644 --- a/ges/ges-track-object.c +++ b/ges/ges-track-object.c @@ -50,6 +50,12 @@ static GQuark _priority_quark; G_DEFINE_TYPE_WITH_CODE (GESTrackObject, ges_track_object, G_TYPE_OBJECT, _do_init); +struct _GESTrackObjectPrivate +{ + /* Dummy variable */ + void *nothing; +}; + enum { PROP_0, @@ -159,6 +165,8 @@ ges_track_object_class_init (GESTrackObjectClass * klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); + g_type_class_add_private (klass, sizeof (GESTrackObjectPrivate)); + object_class->get_property = ges_track_object_get_property; object_class->set_property = ges_track_object_set_property; object_class->dispose = ges_track_object_dispose; @@ -239,6 +247,9 @@ ges_track_object_class_init (GESTrackObjectClass * klass) static void ges_track_object_init (GESTrackObject * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TRACK_OBJECT, GESTrackObjectPrivate); + /* Sane default values */ self->pending_start = 0; self->pending_inpoint = 0; @@ -302,7 +313,7 @@ ges_track_object_set_duration_internal (GESTrackObject * object, /* NOTE: we handle priority differently than other properties! the gnlpriority * is object->base_priority + object->priority_offset! A change to either one * will trigger an update to the gnonlin priority and a subsequent property - * notification. + * notification. */ gboolean diff --git a/ges/ges-track-object.h b/ges/ges-track-object.h index 572401e82e..c523af5f66 100644 --- a/ges/ges-track-object.h +++ b/ges/ges-track-object.h @@ -87,6 +87,8 @@ G_BEGIN_DECLS #define GES_TRACK_OBJECT_PRIORITY_OFFSET(obj)\ (((GESTrackObject*)obj)->priority_offset) +typedef struct _GESTrackObjectPrivate GESTrackObjectPrivate; + /** * GESTrackObject: * @timelineobj: The #GESTimelineObject to which this object belongs. @@ -133,6 +135,8 @@ struct _GESTrackObject { GstElement *gnlobject; + GESTrackObjectPrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-track-operation.c b/ges/ges-track-operation.c index a02250fafd..d010d89ec4 100644 --- a/ges/ges-track-operation.c +++ b/ges/ges-track-operation.c @@ -29,6 +29,12 @@ G_DEFINE_TYPE (GESTrackOperation, ges_track_operation, GES_TYPE_TRACK_OBJECT); +struct _GESTrackOperationPrivate +{ + /* Dummy variable */ + void *nothing; +}; + static void ges_track_operation_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) @@ -97,6 +103,8 @@ ges_track_operation_class_init (GESTrackOperationClass * klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GESTrackObjectClass *track_class = GES_TRACK_OBJECT_CLASS (klass); + g_type_class_add_private (klass, sizeof (GESTrackOperationPrivate)); + object_class->get_property = ges_track_operation_get_property; object_class->set_property = ges_track_operation_set_property; object_class->dispose = ges_track_operation_dispose; @@ -109,4 +117,6 @@ ges_track_operation_class_init (GESTrackOperationClass * klass) static void ges_track_operation_init (GESTrackOperation * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TRACK_OPERATION, GESTrackOperationPrivate); } diff --git a/ges/ges-track-operation.h b/ges/ges-track-operation.h index 0212c327dc..1ef842fb52 100644 --- a/ges/ges-track-operation.h +++ b/ges/ges-track-operation.h @@ -45,6 +45,8 @@ G_BEGIN_DECLS #define GES_TRACK_OPERATION_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_OPERATION, GESTrackOperationClass)) +typedef struct _GESTrackOperationPrivate GESTrackOperationPrivate; + /** * GESTrackOperation: * @parent: parent @@ -59,6 +61,8 @@ struct _GESTrackOperation { /*< private >*/ GstElement *element; + GESTrackOperationPrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-track-source.c b/ges/ges-track-source.c index 7418c75c46..8b38b273a9 100644 --- a/ges/ges-track-source.c +++ b/ges/ges-track-source.c @@ -29,6 +29,12 @@ G_DEFINE_TYPE (GESTrackSource, ges_track_source, GES_TYPE_TRACK_OBJECT); +struct _GESTrackSourcePrivate +{ + /* Dummy variable */ + void *nothing; +}; + static void ges_track_source_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) @@ -97,6 +103,8 @@ ges_track_source_class_init (GESTrackSourceClass * klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GESTrackObjectClass *track_class = GES_TRACK_OBJECT_CLASS (klass); + g_type_class_add_private (klass, sizeof (GESTrackSourcePrivate)); + object_class->get_property = ges_track_source_get_property; object_class->set_property = ges_track_source_set_property; object_class->dispose = ges_track_source_dispose; @@ -109,6 +117,8 @@ ges_track_source_class_init (GESTrackSourceClass * klass) static void ges_track_source_init (GESTrackSource * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TRACK_SOURCE, GESTrackSourcePrivate); } GESTrackSource * diff --git a/ges/ges-track-source.h b/ges/ges-track-source.h index 15a4a2abaa..81bc781e89 100644 --- a/ges/ges-track-source.h +++ b/ges/ges-track-source.h @@ -45,6 +45,8 @@ G_BEGIN_DECLS #define GES_TRACK_SOURCE_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_SOURCE, GESTrackSourceClass)) +typedef struct _GESTrackSourcePrivate GESTrackSourcePrivate; + /** * GESTrackSource: * @parent: parent @@ -59,6 +61,8 @@ struct _GESTrackSource { /*< private >*/ GstElement *element; + GESTrackSourcePrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-track-text-overlay.c b/ges/ges-track-text-overlay.c index f13b2b6ca0..553e8a0145 100644 --- a/ges/ges-track-text-overlay.c +++ b/ges/ges-track-text-overlay.c @@ -33,6 +33,12 @@ G_DEFINE_TYPE (GESTrackTextOverlay, ges_track_text_overlay, GES_TYPE_TRACK_OPERATION); +struct _GESTrackTextOverlayPrivate +{ + /* Dummy variable */ + void *nothing; +}; + enum { PROP_0, @@ -57,6 +63,8 @@ ges_track_text_overlay_class_init (GESTrackTextOverlayClass * klass) GObjectClass *object_class; GESTrackOperationClass *bg_class; + g_type_class_add_private (klass, sizeof (GESTrackTextOverlayPrivate)); + object_class = G_OBJECT_CLASS (klass); bg_class = GES_TRACK_OPERATION_CLASS (klass); @@ -71,6 +79,9 @@ ges_track_text_overlay_class_init (GESTrackTextOverlayClass * klass) static void ges_track_text_overlay_init (GESTrackTextOverlay * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TRACK_TEXT_OVERLAY, GESTrackTextOverlayPrivate); + self->text = NULL; self->font_desc = NULL; self->text_el = NULL; diff --git a/ges/ges-track-text-overlay.h b/ges/ges-track-text-overlay.h index 7e5a7ef6fc..9dd8e97f16 100644 --- a/ges/ges-track-text-overlay.h +++ b/ges/ges-track-text-overlay.h @@ -45,6 +45,8 @@ G_BEGIN_DECLS #define GES_TRACK_TEXT_OVERLAY_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_TEXT_OVERLAY, GESTrackTextOverlayClass)) +typedef struct _GESTrackTextOverlayPrivate GESTrackTextOverlayPrivate; + /** * GESTrackTextOverlay: * @@ -59,6 +61,8 @@ struct _GESTrackTextOverlay { GESTextVAlign valign; GstElement *text_el; + GESTrackTextOverlayPrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-track-title-source.c b/ges/ges-track-title-source.c index cf29b8c8d3..e15cf0914a 100644 --- a/ges/ges-track-title-source.c +++ b/ges/ges-track-title-source.c @@ -31,6 +31,12 @@ G_DEFINE_TYPE (GESTrackTitleSource, ges_track_title_src, GES_TYPE_TRACK_SOURCE); +struct _GESTrackTitleSourcePrivate +{ + /* Dummy variable */ + void *nothing; +}; + enum { PROP_0, @@ -54,6 +60,8 @@ ges_track_title_src_class_init (GESTrackTitleSourceClass * klass) GObjectClass *object_class; GESTrackSourceClass *bg_class; + g_type_class_add_private (klass, sizeof (GESTrackTitleSourcePrivate)); + object_class = G_OBJECT_CLASS (klass); bg_class = GES_TRACK_SOURCE_CLASS (klass); @@ -68,6 +76,9 @@ ges_track_title_src_class_init (GESTrackTitleSourceClass * klass) static void ges_track_title_src_init (GESTrackTitleSource * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TRACK_TITLE_SOURCE, GESTrackTitleSourcePrivate); + self->text = NULL; self->font_desc = NULL; self->text_el = NULL; diff --git a/ges/ges-track-title-source.h b/ges/ges-track-title-source.h index fd12752828..88afcbc77e 100644 --- a/ges/ges-track-title-source.h +++ b/ges/ges-track-title-source.h @@ -44,6 +44,8 @@ G_BEGIN_DECLS #define GES_TRACK_TITLE_SOURCE_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_TITLE_SOURCE, GESTrackTitleSourceClass)) +typedef struct _GESTrackTitleSourcePrivate GESTrackTitleSourcePrivate; + /** * GESTrackTitleSource: * @@ -59,6 +61,8 @@ struct _GESTrackTitleSource { GstElement *text_el; GstElement *background_el; + GESTrackTitleSourcePrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-track-transition.c b/ges/ges-track-transition.c index 079107b70d..937591dc5e 100644 --- a/ges/ges-track-transition.c +++ b/ges/ges-track-transition.c @@ -31,6 +31,12 @@ G_DEFINE_TYPE (GESTrackTransition, ges_track_transition, GES_TYPE_TRACK_OBJECT); +struct _GESTrackTransitionPrivate +{ + /* Dummy variable */ + void *nothing; +}; + GstElement *ges_track_transition_create_element (GESTrackTransition * self); static void @@ -106,6 +112,8 @@ ges_track_transition_class_init (GESTrackTransitionClass * klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GESTrackObjectClass *track_class = GES_TRACK_OBJECT_CLASS (klass); + g_type_class_add_private (klass, sizeof (GESTrackTransitionPrivate)); + object_class->get_property = ges_track_transition_get_property; object_class->set_property = ges_track_transition_set_property; object_class->dispose = ges_track_transition_dispose; @@ -118,4 +126,7 @@ ges_track_transition_class_init (GESTrackTransitionClass * klass) static void ges_track_transition_init (GESTrackTransition * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TRACK_TRANSITION, GESTrackTransitionPrivate); + } diff --git a/ges/ges-track-transition.h b/ges/ges-track-transition.h index 58b5503a32..b95b6816f4 100644 --- a/ges/ges-track-transition.h +++ b/ges/ges-track-transition.h @@ -50,6 +50,8 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_TRANSITION,\ GESTrackTransitionClass)) +typedef struct _GESTrackTransitionPrivate GESTrackTransitionPrivate; + /** * GESTrackTransition: * @@ -63,6 +65,8 @@ struct _GESTrackTransition GESTrackObject parent; /*< private >*/ + GESTrackTransitionPrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-track-video-test-source.c b/ges/ges-track-video-test-source.c index 74feb68316..9f54806e11 100644 --- a/ges/ges-track-video-test-source.c +++ b/ges/ges-track-video-test-source.c @@ -30,6 +30,12 @@ G_DEFINE_TYPE (GESTrackVideoTestSource, ges_track_video_test_source, GES_TYPE_TRACK_SOURCE); +struct _GESTrackVideoTestSourcePrivate +{ + /* Dummy variable */ + void *nothing; +}; + enum { PROP_0, @@ -54,6 +60,8 @@ ges_track_video_test_source_class_init (GESTrackVideoTestSourceClass * klass) GObjectClass *object_class; GESTrackSourceClass *track_source_class; + g_type_class_add_private (klass, sizeof (GESTrackVideoTestSourcePrivate)); + object_class = G_OBJECT_CLASS (klass); track_source_class = GES_TRACK_SOURCE_CLASS (klass); @@ -69,6 +77,9 @@ ges_track_video_test_source_class_init (GESTrackVideoTestSourceClass * klass) static void ges_track_video_test_source_init (GESTrackVideoTestSource * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TRACK_VIDEO_TEST_SOURCE, GESTrackVideoTestSourcePrivate); + self->pattern = GES_VIDEO_TEST_PATTERN_BLACK; } diff --git a/ges/ges-track-video-test-source.h b/ges/ges-track-video-test-source.h index 331a6c11b9..e787dd4b14 100644 --- a/ges/ges-track-video-test-source.h +++ b/ges/ges-track-video-test-source.h @@ -45,6 +45,8 @@ G_BEGIN_DECLS #define GES_TRACK_VIDEO_TEST_SOURCE_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_VIDEO_TEST_SOURCE, GESTrackVideoTestSourceClass)) +typedef struct _GESTrackVideoTestSourcePrivate GESTrackVideoTestSourcePrivate; + /** * GESTrackVideoTestSource: */ @@ -54,6 +56,8 @@ struct _GESTrackVideoTestSource { /*< private >*/ GESVideoTestPattern pattern; + GESTrackVideoTestSourcePrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-track-video-transition.c b/ges/ges-track-video-transition.c index b7d9e5a2ee..12d4096dac 100644 --- a/ges/ges-track-video-transition.c +++ b/ges/ges-track-video-transition.c @@ -31,6 +31,12 @@ G_DEFINE_TYPE (GESTrackVideoTransition, ges_track_video_transition, GES_TYPE_TRACK_TRANSITION); +struct _GESTrackVideoTransitionPrivate +{ + /* Dummy variable */ + void *nothing; +}; + enum { PROP_0, @@ -69,6 +75,8 @@ ges_track_video_transition_class_init (GESTrackVideoTransitionClass * klass) GESTrackObjectClass *toclass; GESTrackTransitionClass *pclass; + g_type_class_add_private (klass, sizeof (GESTrackVideoTransitionPrivate)); + object_class = G_OBJECT_CLASS (klass); toclass = GES_TRACK_OBJECT_CLASS (klass); pclass = GES_TRACK_TRANSITION_CLASS (klass); @@ -86,6 +94,9 @@ ges_track_video_transition_class_init (GESTrackVideoTransitionClass * klass) static void ges_track_video_transition_init (GESTrackVideoTransition * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TRACK_VIDEO_TRANSITION, GESTrackVideoTransitionPrivate); + self->controller = NULL; self->control_source = NULL; self->smpte = NULL; diff --git a/ges/ges-track-video-transition.h b/ges/ges-track-video-transition.h index dea060db43..ec67d9bf23 100644 --- a/ges/ges-track-video-transition.h +++ b/ges/ges-track-video-transition.h @@ -44,6 +44,8 @@ G_BEGIN_DECLS #define GES_TRACK_VIDEO_TRANSITION_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_VIDEO_TRANSITION, GESTrackVideoTransitionClass)) +typedef struct _GESTrackVideoTransitionPrivate GESTrackVideoTransitionPrivate; + /** * GESTrackVideoTransition: */ @@ -69,6 +71,8 @@ struct _GESTrackVideoTransition { gdouble start_value; gdouble end_value; + GESTrackVideoTransitionPrivate *priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; }; diff --git a/ges/ges-track.c b/ges/ges-track.c index 0c5c79ed6d..941c2e063f 100644 --- a/ges/ges-track.c +++ b/ges/ges-track.c @@ -35,6 +35,12 @@ G_DEFINE_TYPE (GESTrack, ges_track, GST_TYPE_BIN); +struct _GESTrackPrivate +{ + /* Dummy variable */ + void *nothing; +}; + enum { ARG_0, @@ -118,6 +124,8 @@ ges_track_class_init (GESTrackClass * klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); + g_type_class_add_private (klass, sizeof (GESTrackPrivate)); + object_class->get_property = ges_track_get_property; object_class->set_property = ges_track_set_property; object_class->dispose = ges_track_dispose; @@ -156,6 +164,9 @@ ges_track_class_init (GESTrackClass * klass) static void ges_track_init (GESTrack * self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GES_TYPE_TRACK, GESTrackPrivate); + self->composition = gst_element_factory_make ("gnlcomposition", NULL); g_signal_connect (self->composition, "pad-added", (GCallback) pad_added_cb, diff --git a/ges/ges-track.h b/ges/ges-track.h index 4bd36873cd..0953d6bed9 100644 --- a/ges/ges-track.h +++ b/ges/ges-track.h @@ -45,6 +45,8 @@ G_BEGIN_DECLS #define GES_TRACK_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK, GESTrackClass)) +typedef struct _GESTrackPrivate GESTrackPrivate; + /** * GESTrack: * @type: a #GESTrackType indicting the basic type of the track. @@ -67,6 +69,8 @@ struct _GESTrack { GstElement * composition; /* The composition associated with this track */ GstPad * srcpad; /* The source GhostPad */ + GESTrackPrivate * priv; + /* Padding for API extension */ gpointer _ges_reserved[GES_PADDING]; };