From 65a7c66053d834d3d1ba923da14a6ab55a1be0f8 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 14 Oct 2011 12:57:38 +0200 Subject: [PATCH] pad: clean up parent_class handling --- gst/gstpad.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gst/gstpad.c b/gst/gstpad.c index fbec562019..6cd895b839 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -146,7 +146,6 @@ static void gst_pad_fixate_caps_default (GstPad * pad, GstCaps * caps); static GstFlowReturn gst_pad_chain_list_default (GstPad * pad, GstBufferList * list); -static GstObjectClass *parent_class = NULL; static guint gst_pad_signals[LAST_SIGNAL] = { 0 }; static GParamSpec *pspec_caps = NULL; @@ -237,6 +236,7 @@ gst_flow_to_quark (GstFlowReturn ret) GST_DEBUG_BOLD | GST_DEBUG_FG_GREEN, "dataflow inside pads"); \ } +#define gst_pad_parent_class parent_class G_DEFINE_TYPE_WITH_CODE (GstPad, gst_pad, GST_TYPE_OBJECT, _do_init); static void @@ -250,8 +250,6 @@ gst_pad_class_init (GstPadClass * klass) g_type_class_add_private (klass, sizeof (GstPadPrivate)); - parent_class = g_type_class_peek_parent (klass); - gobject_class->dispose = gst_pad_dispose; gobject_class->finalize = gst_pad_finalize; gobject_class->set_property = gst_pad_set_property;