mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 18:20:44 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: remove duplicate pad parent_class variable

Browse source 
G_DEFINE_TYPE already provides one, just need to use it.
This commit is contained in:
Tim-Philipp Müller 2014-12-28 18:24:21 +00:00
parent 85171e3512
commit 760d3c5611
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/gst/base/gstaggregator.c
View file

@ -1818,7 +1818,6 @@ pad_activate_mode_func (GstPad * pad,
/*********************************** /***********************************
* GstAggregatorPad implementation * * GstAggregatorPad implementation *
************************************/ ************************************/
static GstPadClass *aggregator_pad_parent_class = NULL;
G_DEFINE_TYPE (GstAggregatorPad, gst_aggregator_pad, GST_TYPE_PAD); G_DEFINE_TYPE (GstAggregatorPad, gst_aggregator_pad, GST_TYPE_PAD);
static void static void
@ -1845,7 +1844,7 @@ gst_aggregator_pad_finalize (GObject * object)
g_cond_clear (&pad->priv->event_cond); g_cond_clear (&pad->priv->event_cond);
g_mutex_clear (&pad->priv->stream_lock); g_mutex_clear (&pad->priv->stream_lock);
G_OBJECT_CLASS (aggregator_pad_parent_class)->finalize (object); G_OBJECT_CLASS (gst_aggregator_pad_parent_class)->finalize (object);
} }
static void static void
@ -1858,7 +1857,7 @@ gst_aggregator_pad_dispose (GObject * object)
if (buf) if (buf)
gst_buffer_unref (buf); gst_buffer_unref (buf);
G_OBJECT_CLASS (aggregator_pad_parent_class)->dispose (object); G_OBJECT_CLASS (gst_aggregator_pad_parent_class)->dispose (object);
} }
static void static void
@ -1866,7 +1865,6 @@ gst_aggregator_pad_class_init (GstAggregatorPadClass * klass)
{ {
GObjectClass *gobject_class = (GObjectClass *) klass; GObjectClass *gobject_class = (GObjectClass *) klass;
aggregator_pad_parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (GstAggregatorPadPrivate)); g_type_class_add_private (klass, sizeof (GstAggregatorPadPrivate));
gobject_class->constructed = GST_DEBUG_FUNCPTR (_pad_constructed); gobject_class->constructed = GST_DEBUG_FUNCPTR (_pad_constructed);