controller: user the parent_class vars from G_DEFINE_TYPE

This commit is contained in:
Stefan Sauer 2011-12-15 16:06:30 +01:00
parent 431fc714c9
commit 26e8e336cc
2 changed files with 5 additions and 10 deletions

View file

@ -51,8 +51,6 @@ GST_DEBUG_CATEGORY_EXTERN (GST_CAT_DEFAULT);
G_DEFINE_TYPE (GstInterpolationControlSource, gst_interpolation_control_source,
GST_TYPE_CONTROL_SOURCE);
static GObjectClass *parent_class = NULL;
/*
* gst_control_point_free:
* @prop: the object to free
@ -672,13 +670,14 @@ gst_interpolation_control_source_finalize (GObject * obj)
gst_interpolation_control_source_reset (self);
g_mutex_unlock (self->lock);
g_mutex_free (self->lock);
G_OBJECT_CLASS (parent_class)->finalize (obj);
G_OBJECT_CLASS (gst_interpolation_control_source_parent_class)->finalize
(obj);
}
static void
gst_interpolation_control_source_dispose (GObject * obj)
{
G_OBJECT_CLASS (parent_class)->dispose (obj);
G_OBJECT_CLASS (gst_interpolation_control_source_parent_class)->dispose (obj);
}
static void
@ -688,7 +687,6 @@ gst_interpolation_control_source_class_init (GstInterpolationControlSourceClass
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GstControlSourceClass *csource_class = GST_CONTROL_SOURCE_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass,
sizeof (GstInterpolationControlSourcePrivate));

View file

@ -608,8 +608,6 @@ gst_lfo_waveform_get_type (void)
G_DEFINE_TYPE (GstLFOControlSource, gst_lfo_control_source,
GST_TYPE_CONTROL_SOURCE);
static GObjectClass *parent_class = NULL;
static void
gst_lfo_control_source_reset (GstLFOControlSource * self)
{
@ -953,13 +951,13 @@ gst_lfo_control_source_finalize (GObject * obj)
self->lock = NULL;
}
G_OBJECT_CLASS (parent_class)->finalize (obj);
G_OBJECT_CLASS (gst_lfo_control_source_parent_class)->finalize (obj);
}
static void
gst_lfo_control_source_dispose (GObject * obj)
{
G_OBJECT_CLASS (parent_class)->dispose (obj);
G_OBJECT_CLASS (gst_lfo_control_source_parent_class)->dispose (obj);
}
static void
@ -1084,7 +1082,6 @@ gst_lfo_control_source_class_init (GstLFOControlSourceClass * klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GstControlSourceClass *csource_class = GST_CONTROL_SOURCE_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (GstLFOControlSourcePrivate));
gobject_class->finalize = gst_lfo_control_source_finalize;