Update for g_type_class_add_private() deprecation in recent GLib

ges/ges-asset.c

@@ -271,6 +271,7 @@ initable_iface_init (GInitableIface * initable_iface)
 }
 
 G_DEFINE_TYPE_WITH_CODE (GESAsset, ges_asset, G_TYPE_OBJECT,
+    G_ADD_PRIVATE (GESAsset)
     G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init)
     G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init)
     G_IMPLEMENT_INTERFACE (GES_TYPE_META_CONTAINER, NULL));
@@ -406,7 +407,6 @@ void
 ges_asset_class_init (GESAssetClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  g_type_class_add_private (klass, sizeof (GESAssetPrivate));
 
   object_class->get_property = ges_asset_get_property;
   object_class->set_property = ges_asset_set_property;
@@ -444,8 +444,7 @@ ges_asset_class_init (GESAssetClass * klass)
 void
 ges_asset_init (GESAsset * self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GES_TYPE_ASSET, GESAssetPrivate);
+  self->priv = ges_asset_get_instance_private (self);
 
   self->priv->state = ASSET_INITIALIZING;
   self->priv->proxied_asset_id = NULL;

ges/ges-audio-source.c

@@ -55,14 +55,15 @@
 #include "ges-audio-source.h"
 #include "ges-layer.h"
 
-G_DEFINE_ABSTRACT_TYPE (GESAudioSource, ges_audio_source, GES_TYPE_SOURCE);
-
 struct _GESAudioSourcePrivate
 {
   GstElement *capsfilter;
   GESTrack *current_track;
 };
 
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GESAudioSource, ges_audio_source,
+    GES_TYPE_SOURCE);
+
 static void
 _sync_element_to_layer_property_float (GESTrackElement * trksrc,
     GstElement * element, const gchar * meta, const gchar * propname)
@@ -187,8 +188,6 @@ ges_audio_source_class_init (GESAudioSourceClass * klass)
   GESTrackElementClass *track_class = GES_TRACK_ELEMENT_CLASS (klass);
   GESAudioSourceClass *audio_source_class = GES_AUDIO_SOURCE_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GESAudioSourcePrivate));
-
   gobject_class->dispose = ges_audio_source_dispose;
   track_class->nleobject_factorytype = "nlesource";
   track_class->create_element = ges_audio_source_create_element;
@@ -198,6 +197,5 @@ ges_audio_source_class_init (GESAudioSourceClass * klass)
 static void
 ges_audio_source_init (GESAudioSource * self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GES_TYPE_AUDIO_SOURCE, GESAudioSourcePrivate);
+  self->priv = ges_audio_source_get_instance_private (self);
 }

ges/ges-audio-test-source.c

@@ -32,8 +32,6 @@
 #include "ges-track-element.h"
 #include "ges-audio-test-source.h"
 
-G_DEFINE_TYPE (GESAudioTestSource, ges_audio_test_source,
-    GES_TYPE_AUDIO_SOURCE);
 #define DEFAULT_VOLUME 1.0
 
 struct _GESAudioTestSourcePrivate
@@ -47,6 +45,9 @@ enum
   PROP_0,
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GESAudioTestSource, ges_audio_test_source,
+    GES_TYPE_AUDIO_SOURCE);
+
 static void ges_audio_test_source_get_property (GObject * object, guint
     property_id, GValue * value, GParamSpec * pspec);
 
@@ -61,8 +62,6 @@ ges_audio_test_source_class_init (GESAudioTestSourceClass * klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GESAudioSourceClass *source_class = GES_AUDIO_SOURCE_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GESAudioTestSourcePrivate));
-
   object_class->get_property = ges_audio_test_source_get_property;
   object_class->set_property = ges_audio_test_source_set_property;
 
@@ -72,9 +71,7 @@ ges_audio_test_source_class_init (GESAudioTestSourceClass * klass)
 static void
 ges_audio_test_source_init (GESAudioTestSource * self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GES_TYPE_AUDIO_TEST_SOURCE, GESAudioTestSourcePrivate);
-
+  self->priv = ges_audio_test_source_get_instance_private (self);
   self->priv->freq = 440;
   self->priv->volume = DEFAULT_VOLUME;
 }

ges/ges-audio-track.c

@@ -56,7 +56,7 @@ struct _GESAudioTrackPrivate
   gpointer nothing;
 };
 
-G_DEFINE_TYPE (GESAudioTrack, ges_audio_track, GES_TYPE_TRACK);
+G_DEFINE_TYPE_WITH_PRIVATE (GESAudioTrack, ges_audio_track, GES_TYPE_TRACK);
 
 /****************************************************
  *              Private methods and utils           *
@@ -80,8 +80,7 @@ create_element_for_raw_audio_gap (GESTrack * track)
 static void
 ges_audio_track_init (GESAudioTrack * self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), GES_TYPE_AUDIO_TRACK,
-      GESAudioTrackPrivate);
+  self->priv = ges_audio_track_get_instance_private (self);
 }
 
 static void
@@ -99,8 +98,6 @@ ges_audio_track_class_init (GESAudioTrackClass * klass)
 /*   GESTrackClass *parent_class = GES_TRACK_CLASS (klass);
  */
 
-  g_type_class_add_private (klass, sizeof (GESAudioTrackPrivate));
-
   object_class->finalize = ges_audio_track_finalize;
 
   GES_TRACK_CLASS (klass)->get_mixing_element = ges_smart_adder_new;

ges/ges-audio-transition.c

@@ -30,8 +30,6 @@
 
 #include <gst/controller/gstdirectcontrolbinding.h>
 
-G_DEFINE_TYPE (GESAudioTransition, ges_audio_transition, GES_TYPE_TRANSITION);
-
 struct _GESAudioTransitionPrivate
 {
   /* these enable volume interpolation. Unlike video, both inputs are adjusted
@@ -47,6 +45,8 @@ enum
   PROP_0,
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GESAudioTransition, ges_audio_transition,
+    GES_TYPE_TRANSITION);
 
 #define fast_element_link(a,b) gst_element_link_pads_full((a),"src",(b),"sink",GST_PAD_LINK_CHECK_NOTHING)
 
@@ -78,8 +78,6 @@ ges_audio_transition_class_init (GESAudioTransitionClass * klass)
   GObjectClass *object_class;
   GESTrackElementClass *toclass;
 
-  g_type_class_add_private (klass, sizeof (GESAudioTransitionPrivate));
-
   object_class = G_OBJECT_CLASS (klass);
   toclass = GES_TRACK_ELEMENT_CLASS (klass);
 
@@ -96,8 +94,7 @@ static void
 ges_audio_transition_init (GESAudioTransition * self)
 {
 
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GES_TYPE_AUDIO_TRANSITION, GESAudioTransitionPrivate);
+  self->priv = ges_audio_transition_get_instance_private (self);
 }
 
 static void

ges/ges-audio-uri-source.c

@@ -118,7 +118,7 @@ ges_extractable_interface_init (GESExtractableInterface * iface)
 }
 
 G_DEFINE_TYPE_WITH_CODE (GESAudioUriSource, ges_audio_uri_source,
-    GES_TYPE_AUDIO_SOURCE,
+    GES_TYPE_AUDIO_SOURCE, G_ADD_PRIVATE (GESAudioUriSource)
     G_IMPLEMENT_INTERFACE (GES_TYPE_EXTRACTABLE,
         ges_extractable_interface_init));
 
@@ -176,8 +176,6 @@ ges_audio_uri_source_class_init (GESAudioUriSourceClass * klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GESAudioSourceClass *source_class = GES_AUDIO_SOURCE_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GESAudioUriSourcePrivate));
-
   object_class->get_property = ges_audio_uri_source_get_property;
   object_class->set_property = ges_audio_uri_source_set_property;
   object_class->dispose = ges_audio_uri_source_dispose;
@@ -197,8 +195,7 @@ ges_audio_uri_source_class_init (GESAudioUriSourceClass * klass)
 static void
 ges_audio_uri_source_init (GESAudioUriSource * self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GES_TYPE_AUDIO_URI_SOURCE, GESAudioUriSourcePrivate);
+  self->priv = ges_audio_uri_source_get_instance_private (self);
 
   g_signal_connect (self, "notify::track",
       G_CALLBACK (ges_audio_uri_source_track_set_cb), NULL);

ges/ges-base-effect-clip.c

@@ -30,26 +30,22 @@
 #include "ges-internal.h"
 #include "ges-types.h"
 
-G_DEFINE_ABSTRACT_TYPE (GESBaseEffectClip, ges_base_effect_clip,
-    GES_TYPE_OPERATION_CLIP);
-
 struct _GESBaseEffectClipPrivate
 {
   void *nothing;
 };
 
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GESBaseEffectClip, ges_base_effect_clip,
+    GES_TYPE_OPERATION_CLIP);
 
 static void
 ges_base_effect_clip_class_init (GESBaseEffectClipClass * klass)
 {
-  g_type_class_add_private (klass, sizeof (GESBaseEffectClipPrivate));
-
 }
 
 static void
 ges_base_effect_clip_init (GESBaseEffectClip * self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GES_TYPE_BASE_EFFECT_CLIP, GESBaseEffectClipPrivate);
+  self->priv = ges_base_effect_clip_get_instance_private (self);
 
 }

ges/ges-base-effect.c

@@ -31,23 +31,21 @@
 #include "ges-track-element.h"
 #include "ges-base-effect.h"
 
-G_DEFINE_ABSTRACT_TYPE (GESBaseEffect, ges_base_effect, GES_TYPE_OPERATION);
-
 struct _GESBaseEffectPrivate
 {
   void *nothing;
 };
 
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GESBaseEffect, ges_base_effect,
+    GES_TYPE_OPERATION);
+
 static void
 ges_base_effect_class_init (GESBaseEffectClass * klass)
 {
-  g_type_class_add_private (klass, sizeof (GESBaseEffectPrivate));
 }
 
 static void
 ges_base_effect_init (GESBaseEffect * self)
 {
-  self->priv =
-      G_TYPE_INSTANCE_GET_PRIVATE (self, GES_TYPE_BASE_EFFECT,
-      GESBaseEffectPrivate);
+  self->priv = ges_base_effect_get_instance_private (self);
 }

ges/ges-base-transition-clip.c

@@ -33,18 +33,16 @@ struct _GESBaseTransitionClipPrivate
   void *nothing;
 };
 
-G_DEFINE_ABSTRACT_TYPE (GESBaseTransitionClip, ges_base_transition_clip,
-    GES_TYPE_OPERATION_CLIP);
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GESBaseTransitionClip,
+    ges_base_transition_clip, GES_TYPE_OPERATION_CLIP);
 
 static void
 ges_base_transition_clip_class_init (GESBaseTransitionClipClass * klass)
 {
-  g_type_class_add_private (klass, sizeof (GESBaseTransitionClipPrivate));
 }
 
 static void
 ges_base_transition_clip_init (GESBaseTransitionClip * self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GES_TYPE_BASE_TRANSITION_CLIP, GESBaseTransitionClipPrivate);
+  self->priv = ges_base_transition_clip_get_instance_private (self);
 }

ges/ges-base-xml-formatter.c

@@ -26,8 +26,6 @@ GST_DEBUG_CATEGORY_STATIC (base_xml_formatter);
 #define GST_CAT_DEFAULT base_xml_formatter
 
 #define parent_class ges_base_xml_formatter_parent_class
-G_DEFINE_ABSTRACT_TYPE (GESBaseXmlFormatter, ges_base_xml_formatter,
-    GES_TYPE_FORMATTER);
 
 #define _GET_PRIV(o)\
   (((GESBaseXmlFormatter*) o)->priv)
@@ -160,6 +158,9 @@ enum
 static guint signals[LAST_SIGNAL];
 */
 
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GESBaseXmlFormatter,
+    ges_base_xml_formatter, GES_TYPE_FORMATTER);
+
 static GMarkupParseContext *
 create_parser_context (GESBaseXmlFormatter * self, const gchar * uri,
     GError ** error)
@@ -373,8 +374,7 @@ ges_base_xml_formatter_init (GESBaseXmlFormatter * self)
 {
   GESBaseXmlFormatterPrivate *priv;
 
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GES_TYPE_BASE_XML_FORMATTER, GESBaseXmlFormatterPrivate);
+  self->priv = ges_base_xml_formatter_get_instance_private (self);
 
   priv = self->priv;
 
@@ -405,7 +405,6 @@ ges_base_xml_formatter_class_init (GESBaseXmlFormatterClass * self_class)
   GESFormatterClass *formatter_klass = GES_FORMATTER_CLASS (self_class);
   GObjectClass *object_class = G_OBJECT_CLASS (self_class);
 
-  g_type_class_add_private (self_class, sizeof (GESBaseXmlFormatterPrivate));
   object_class->dispose = _dispose;
   object_class->finalize = _finalize;
 

ges/ges-clip-asset.c

@@ -29,7 +29,6 @@
 
 #include "ges-clip-asset.h"
 
-G_DEFINE_TYPE (GESClipAsset, ges_clip_asset, GES_TYPE_ASSET);
 #define GES_CLIP_ASSET_GET_PRIVATE(o)\
   (G_TYPE_INSTANCE_GET_PRIVATE ((o), GES_TYPE_CLIP_ASSET, \
    GESClipAssetPrivate))
@@ -51,6 +50,8 @@ enum
 
 static GParamSpec *properties[PROP_LAST];
 
+G_DEFINE_TYPE_WITH_PRIVATE (GESClipAsset, ges_clip_asset, GES_TYPE_ASSET);
+
 /***********************************************
  *                                             *
  *      GObject vmetods implemenation          *
@@ -89,7 +90,7 @@ _set_property (GObject * object, guint property_id,
 static void
 ges_clip_asset_init (GESClipAsset * self)
 {
-  self->priv = GES_CLIP_ASSET_GET_PRIVATE (self);
+  self->priv = ges_clip_asset_get_instance_private (self);
 }
 
 static void
@@ -113,7 +114,6 @@ ges_clip_asset_class_init (GESClipAssetClass * self_class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (self_class);
 
-  g_type_class_add_private (self_class, sizeof (GESClipAssetPrivate));
   object_class->constructed = _constructed;
   object_class->get_property = _get_property;
   object_class->set_property = _set_property;

ges/ges-clip.c

@@ -47,8 +47,6 @@ static gboolean _roll_end (GESTimelineElement * element, GstClockTime end);
 static gboolean _trim (GESTimelineElement * element, GstClockTime start);
 static void _compute_height (GESContainer * container);
 
-G_DEFINE_ABSTRACT_TYPE (GESClip, ges_clip, GES_TYPE_CONTAINER);
-
 typedef enum
 {
   GES_CLIP_IS_SPLITTING = (1 << 0),
@@ -97,6 +95,8 @@ enum
 
 static GParamSpec *properties[PROP_LAST];
 
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GESClip, ges_clip, GES_TYPE_CONTAINER);
+
 /****************************************************
  *              Listen to our children              *
  ****************************************************/
@@ -803,8 +803,6 @@ ges_clip_class_init (GESClipClass * klass)
   GESContainerClass *container_class = GES_CONTAINER_CLASS (klass);
   GESTimelineElementClass *element_class = GES_TIMELINE_ELEMENT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GESClipPrivate));
-
   object_class->get_property = ges_clip_get_property;
   object_class->set_property = ges_clip_set_property;
   object_class->finalize = ges_clip_finalize;
@@ -864,8 +862,7 @@ ges_clip_class_init (GESClipClass * klass)
 static void
 ges_clip_init (GESClip * self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GES_TYPE_CLIP, GESClipPrivate);
+  self->priv = ges_clip_get_instance_private (self);
   /* FIXME, check why it was done this way _DURATION (self) = GST_SECOND; */
   self->priv->layer = NULL;
   self->priv->nb_effects = 0;

ges/ges-command-line-formatter.c

@@ -32,7 +32,7 @@ struct _GESCommandLineFormatterPrivate
 };
 
 
-G_DEFINE_TYPE (GESCommandLineFormatter, ges_command_line_formatter,
+G_DEFINE_TYPE_WITH_PRIVATE (GESCommandLineFormatter, ges_command_line_formatter,
     GES_TYPE_FORMATTER);
 
 static gboolean
@@ -514,21 +514,14 @@ fail:
 }
 
 static void
-ges_command_line_formatter_init (GESCommandLineFormatter *
-    ges_command_line_formatter)
+ges_command_line_formatter_init (GESCommandLineFormatter * formatter)
 {
-  ges_command_line_formatter->priv =
-      G_TYPE_INSTANCE_GET_PRIVATE (ges_command_line_formatter,
-      GES_TYPE_COMMAND_LINE_FORMATTER, GESCommandLineFormatterPrivate);
-
-  /* TODO: Add initialization code here */
+  formatter->priv = ges_command_line_formatter_get_instance_private (formatter);
 }
 
 static void
 ges_command_line_formatter_finalize (GObject * object)
 {
-  /* TODO: Add deinitalization code here */
-
   G_OBJECT_CLASS (ges_command_line_formatter_parent_class)->finalize (object);
 }
 
@@ -538,8 +531,6 @@ ges_command_line_formatter_class_init (GESCommandLineFormatterClass * klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GESFormatterClass *formatter_klass = GES_FORMATTER_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GESCommandLineFormatterPrivate));
-
   object_class->finalize = ges_command_line_formatter_finalize;
 
   formatter_klass->can_load_uri = _can_load;

ges/ges-container.c

@@ -31,10 +31,6 @@
 
 #include <string.h>
 
-#define _GET_PRIV(o) (G_TYPE_INSTANCE_GET_PRIVATE (self, GES_TYPE_CONTAINER, GESContainerPrivate))
-
-G_DEFINE_ABSTRACT_TYPE (GESContainer, ges_container, GES_TYPE_TIMELINE_ELEMENT);
-
 GST_DEBUG_CATEGORY_STATIC (ges_container_debug);
 #undef GST_CAT_DEFAULT
 #define GST_CAT_DEFAULT ges_container_debug
@@ -95,6 +91,9 @@ enum
 
 static GParamSpec *properties[PROP_LAST];
 
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GESContainer, ges_container,
+    GES_TYPE_TIMELINE_ELEMENT);
+
 /************************
  *   Private  methods   *
  ************************/
@@ -425,8 +424,6 @@ ges_container_class_init (GESContainerClass * klass)
   GST_DEBUG_CATEGORY_INIT (ges_container_debug, "gescontainer",
       GST_DEBUG_FG_YELLOW, "ges container");
 
-  g_type_class_add_private (klass, sizeof (GESContainerPrivate));
-
   object_class->get_property = _get_property;
   object_class->set_property = _set_property;
   object_class->dispose = _dispose;
@@ -494,7 +491,7 @@ ges_container_class_init (GESContainerClass * klass)
 static void
 ges_container_init (GESContainer * self)
 {
-  self->priv = _GET_PRIV (self);
+  self->priv = ges_container_get_instance_private (self);
 
   /* FIXME, check why default was GST_SECOND? (before the existend of
    * ges-container)

ges/ges-effect-asset.c

@@ -29,14 +29,13 @@
 #include "ges-track-element.h"
 #include "ges-internal.h"
 
-G_DEFINE_TYPE (GESEffectAsset, ges_effect_asset, GES_TYPE_TRACK_ELEMENT_ASSET);
-
 struct _GESEffectAssetPrivate
 {
   gpointer nothing;
 };
 
-
+G_DEFINE_TYPE_WITH_PRIVATE (GESEffectAsset, ges_effect_asset,
+    GES_TYPE_TRACK_ELEMENT_ASSET);
 
 static void
 _fill_track_type (GESAsset * asset)
@@ -78,8 +77,7 @@ _extract (GESAsset * asset, GError ** error)
 static void
 ges_effect_asset_init (GESEffectAsset * self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GES_TYPE_EFFECT_ASSET, GESEffectAssetPrivate);
+  self->priv = ges_effect_asset_get_instance_private (self);
 }
 
 static void
@@ -102,8 +100,6 @@ ges_effect_asset_class_init (GESEffectAssetClass * klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GESAssetClass *asset_class = GES_ASSET_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GESEffectAssetPrivate));
-
   object_class->finalize = ges_effect_asset_finalize;
   object_class->constructed = ges_effect_asset_constructed;
   asset_class->extract = _extract;

ges/ges-effect-clip.c

@@ -31,14 +31,15 @@
 #include "ges-internal.h"
 #include "ges-types.h"
 
-G_DEFINE_TYPE (GESEffectClip, ges_effect_clip, GES_TYPE_BASE_EFFECT_CLIP);
-
 struct _GESEffectClipPrivate
 {
   gchar *video_bin_description;
   gchar *audio_bin_description;
 };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GESEffectClip, ges_effect_clip,
+    GES_TYPE_BASE_EFFECT_CLIP);
+
 enum
 {
   PROP_0,
@@ -103,8 +104,6 @@ ges_effect_clip_class_init (GESEffectClipClass * klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GESClipClass *timobj_class = GES_CLIP_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GESEffectClipPrivate));
-
   object_class->get_property = ges_effect_clip_get_property;
   object_class->set_property = ges_effect_clip_set_property;
   object_class->finalize = ges_effect_clip_finalize;
@@ -143,9 +142,7 @@ ges_effect_clip_class_init (GESEffectClipClass * klass)
 static void
 ges_effect_clip_init (GESEffectClip * self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GES_TYPE_EFFECT_CLIP, GESEffectClipPrivate);
-
+  self->priv = ges_effect_clip_get_instance_private (self);
 }
 
 static GESTrackElement *

ges/ges-effect.c

@@ -33,10 +33,6 @@
 
 static void ges_extractable_interface_init (GESExtractableInterface * iface);
 
-G_DEFINE_TYPE_WITH_CODE (GESEffect,
-    ges_effect, GES_TYPE_BASE_EFFECT,
-    G_IMPLEMENT_INTERFACE (GES_TYPE_EXTRACTABLE,
-        ges_extractable_interface_init));
 
 static void ges_effect_dispose (GObject * object);
 static void ges_effect_finalize (GObject * object);
@@ -53,6 +49,11 @@ enum
   PROP_BIN_DESCRIPTION,
 };
 
+G_DEFINE_TYPE_WITH_CODE (GESEffect,
+    ges_effect, GES_TYPE_BASE_EFFECT, G_ADD_PRIVATE (GESEffect)
+    G_IMPLEMENT_INTERFACE (GES_TYPE_EXTRACTABLE,
+        ges_extractable_interface_init));
+
 static gchar *
 extractable_check_id (GType type, const gchar * id, GError ** error)
 {
@@ -186,8 +187,6 @@ ges_effect_class_init (GESEffectClass * klass)
   obj_bg_class = GES_TRACK_ELEMENT_CLASS (klass);
   element_class = GES_TIMELINE_ELEMENT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GESEffectPrivate));
-
   object_class->get_property = ges_effect_get_property;
   object_class->set_property = ges_effect_set_property;
   object_class->dispose = ges_effect_dispose;
@@ -220,8 +219,7 @@ ges_effect_class_init (GESEffectClass * klass)
 static void
 ges_effect_init (GESEffect * self)
 {
-  self->priv =
-      G_TYPE_INSTANCE_GET_PRIVATE (self, GES_TYPE_EFFECT, GESEffectPrivate);
+  self->priv = ges_effect_get_instance_private (self);
 }
 
 static void

ges/ges-formatter.c

@@ -37,15 +37,16 @@
 /* TODO Add a GCancellable somewhere in the API */
 static void ges_extractable_interface_init (GESExtractableInterface * iface);
 
-G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GESFormatter, ges_formatter,
-    G_TYPE_INITIALLY_UNOWNED, G_IMPLEMENT_INTERFACE (GES_TYPE_EXTRACTABLE,
-        ges_extractable_interface_init));
-
 struct _GESFormatterPrivate
 {
   gpointer nothing;
 };
 
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GESFormatter, ges_formatter,
+    G_TYPE_INITIALLY_UNOWNED, G_ADD_PRIVATE (GESFormatter)
+    G_IMPLEMENT_INTERFACE (GES_TYPE_EXTRACTABLE,
+        ges_extractable_interface_init));
+
 static void ges_formatter_dispose (GObject * object);
 static gboolean default_can_load_uri (GESFormatter * dummy_instance,
     const gchar * uri, GError ** error);
@@ -113,8 +114,6 @@ ges_formatter_class_init (GESFormatterClass * klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GESFormatterPrivate));
-
   object_class->dispose = ges_formatter_dispose;
 
   klass->can_load_uri = default_can_load_uri;
@@ -134,8 +133,7 @@ ges_formatter_class_init (GESFormatterClass * klass)
 static void
 ges_formatter_init (GESFormatter * object)
 {
-  object->priv = G_TYPE_INSTANCE_GET_PRIVATE (object,
-      GES_TYPE_FORMATTER, GESFormatterPrivate);
+  object->priv = ges_formatter_get_instance_private (object);
   object->project = NULL;
 }
 

ges/ges-group.c

@@ -39,8 +39,6 @@
 #include <string.h>
 
 #define parent_class ges_group_parent_class
-G_DEFINE_TYPE (GESGroup, ges_group, GES_TYPE_CONTAINER);
-
 #define GES_CHILDREN_INIBIT_SIGNAL_EMISSION (GES_CHILDREN_LAST + 1)
 #define GES_GROUP_SIGNALS_IDS_DATA_KEY_FORMAT "ges-group-signals-ids-%p"
 
@@ -76,6 +74,8 @@ enum
 
 static GParamSpec *properties[PROP_LAST] = { NULL, };
 
+G_DEFINE_TYPE_WITH_PRIVATE (GESGroup, ges_group, GES_TYPE_CONTAINER);
+
 /****************************************************
  *              Our listening of children           *
  ****************************************************/
@@ -711,8 +711,6 @@ ges_group_class_init (GESGroupClass * klass)
   GESContainerClass *container_class = GES_CONTAINER_CLASS (klass);
   GESTimelineElementClass *element_class = GES_TIMELINE_ELEMENT_CLASS (klass);