diff options
| author | Havard Graff <havard.graff@gmail.com> | 2017-03-31 16:36:05 +0200 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2017-11-24 13:39:39 +0100 |
| commit | df27ec3e67a929b3d57ee791e5a8574812a498d9 (patch) | |
| tree | b757c08e416de6350f90a8d4a446ca2363fbbee2 /plugins | |
| parent | b63ed9e066e24e3fb110cff351fbf841a16c475f (diff) | |
gstbasetranform: replace GST_BASE_TRANSFORM with GST_BASE_TRANSFORM_CAST
To avoid a global type-lock on chain etc.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/elements/gstfunnel.c | 14 | ||||
| -rw-r--r-- | plugins/elements/gstfunnel.h | 1 |
2 files changed, 8 insertions, 7 deletions
diff --git a/plugins/elements/gstfunnel.c b/plugins/elements/gstfunnel.c index a9293383a..af52f3832 100644 --- a/plugins/elements/gstfunnel.c +++ b/plugins/elements/gstfunnel.c @@ -128,7 +128,7 @@ static void gst_funnel_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) { - GstFunnel *funnel = GST_FUNNEL (object); + GstFunnel *funnel = GST_FUNNEL_CAST (object); switch (prop_id) { case PROP_FORWARD_STICKY_EVENTS: @@ -144,7 +144,7 @@ static void gst_funnel_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) { - GstFunnel *funnel = GST_FUNNEL (object); + GstFunnel *funnel = GST_FUNNEL_CAST (object); switch (prop_id) { case PROP_FORWARD_STICKY_EVENTS: @@ -159,7 +159,7 @@ gst_funnel_get_property (GObject * object, guint prop_id, GValue * value, static void gst_funnel_dispose (GObject * object) { - GstFunnel *funnel = GST_FUNNEL (object); + GstFunnel *funnel = GST_FUNNEL_CAST (object); GList *item; gst_object_replace ((GstObject **) & funnel->last_sinkpad, NULL); @@ -278,7 +278,7 @@ done: static void gst_funnel_release_pad (GstElement * element, GstPad * pad) { - GstFunnel *funnel = GST_FUNNEL (element); + GstFunnel *funnel = GST_FUNNEL_CAST (element); GstFunnelPad *fpad = GST_FUNNEL_PAD_CAST (pad); gboolean got_eos; gboolean send_eos = FALSE; @@ -350,7 +350,7 @@ static GstFlowReturn gst_funnel_sink_chain_list (GstPad * pad, GstObject * parent, GstBufferList * list) { - GstFunnel *funnel = GST_FUNNEL (parent); + GstFunnel *funnel = GST_FUNNEL_CAST (parent); return gst_funnel_sink_chain_object (pad, funnel, TRUE, GST_MINI_OBJECT_CAST (list)); @@ -359,7 +359,7 @@ gst_funnel_sink_chain_list (GstPad * pad, GstObject * parent, static GstFlowReturn gst_funnel_sink_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) { - GstFunnel *funnel = GST_FUNNEL (parent); + GstFunnel *funnel = GST_FUNNEL_CAST (parent); return gst_funnel_sink_chain_object (pad, funnel, FALSE, GST_MINI_OBJECT_CAST (buffer)); @@ -368,7 +368,7 @@ gst_funnel_sink_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) static gboolean gst_funnel_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) { - GstFunnel *funnel = GST_FUNNEL (parent); + GstFunnel *funnel = GST_FUNNEL_CAST (parent); GstFunnelPad *fpad = GST_FUNNEL_PAD_CAST (pad); gboolean forward = TRUE; gboolean res = TRUE; diff --git a/plugins/elements/gstfunnel.h b/plugins/elements/gstfunnel.h index 9a53b5d74..8c0210962 100644 --- a/plugins/elements/gstfunnel.h +++ b/plugins/elements/gstfunnel.h @@ -40,6 +40,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FUNNEL)) #define GST_IS_FUNNEL_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FUNNEL)) +#define GST_FUNNEL_CAST(obj) ((GstFunnel *)(obj)) typedef struct _GstFunnel GstFunnel; typedef struct _GstFunnelClass GstFunnelClass; |