From 501d5b27792b3bb0a0b639ed4e00405aa4c450a9 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 21 Nov 2011 10:54:56 +0100 Subject: [PATCH] gme: Port to new pad function signatures --- ext/gme/gstgme.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/ext/gme/gstgme.c b/ext/gme/gstgme.c index d5e63dc9fd..eda7e3f27a 100644 --- a/ext/gme/gstgme.c +++ b/ext/gme/gstgme.c @@ -48,9 +48,12 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, #define gst_gme_dec_parent_class parent_class G_DEFINE_TYPE (GstGmeDec, gst_gme_dec, GST_TYPE_ELEMENT); -static GstFlowReturn gst_gme_dec_chain (GstPad * pad, GstBuffer * buffer); -static gboolean gst_gme_dec_sink_event (GstPad * pad, GstEvent * event); -static gboolean gst_gme_dec_src_event (GstPad * pad, GstEvent * event); +static GstFlowReturn gst_gme_dec_chain (GstPad * pad, GstObject * parent, + GstBuffer * buffer); +static gboolean gst_gme_dec_sink_event (GstPad * pad, GstObject * parent, + GstEvent * event); +static gboolean gst_gme_dec_src_event (GstPad * pad, GstObject * parent, + GstEvent * event); static gboolean gst_gme_dec_src_query (GstPad * pad, GstObject * parent, GstQuery * query); static GstStateChangeReturn gst_gme_dec_change_state (GstElement * element, @@ -161,22 +164,20 @@ gst_gme_dec_dispose (GObject * object) } static GstFlowReturn -gst_gme_dec_chain (GstPad * pad, GstBuffer * buffer) +gst_gme_dec_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) { - GstGmeDec *gme = GST_GME_DEC (gst_pad_get_parent (pad)); + GstGmeDec *gme = GST_GME_DEC (parent); /* Accumulate GME data until end-of-stream, then commence playback. */ gst_adapter_push (gme->adapter, buffer); - gst_object_unref (gme); - return GST_FLOW_OK; } static gboolean -gst_gme_dec_sink_event (GstPad * pad, GstEvent * event) +gst_gme_dec_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) { - GstGmeDec *gme = GST_GME_DEC (gst_pad_get_parent (pad)); + GstGmeDec *gme = GST_GME_DEC (parent); gboolean result = TRUE; gboolean forward = FALSE; @@ -199,15 +200,13 @@ gst_gme_dec_sink_event (GstPad * pad, GstEvent * event) else gst_event_unref (event); - gst_object_unref (gme); - return result; } static gboolean -gst_gme_dec_src_event (GstPad * pad, GstEvent * event) +gst_gme_dec_src_event (GstPad * pad, GstObject * parent, GstEvent * event) { - GstGmeDec *gme = GST_GME_DEC (gst_pad_get_parent (pad)); + GstGmeDec *gme = GST_GME_DEC (parent); gboolean result = FALSE; switch (GST_EVENT_TYPE (event)) { @@ -297,8 +296,6 @@ gst_gme_dec_src_event (GstPad * pad, GstEvent * event) break; } - gst_object_unref (gme); - return result; }