From cbccf7d5bfc4bba4e047110c61253cf3726d671a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 15 Aug 2011 13:24:11 +0200 Subject: [PATCH] pad: fix some macros Remove a rather usless macro to check if a pad mode is active and add GST_PAD_IS_ACTIVE(). --- gst/gstpad.c | 2 +- gst/gstpad.h | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/gst/gstpad.c b/gst/gstpad.c index 0e8751a..64ba962 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -1021,7 +1021,7 @@ gst_pad_is_active (GstPad * pad) g_return_val_if_fail (GST_IS_PAD (pad), FALSE); GST_OBJECT_LOCK (pad); - result = GST_PAD_MODE_ACTIVATE (GST_PAD_ACTIVATE_MODE (pad)); + result = GST_PAD_IS_ACTIVE (pad); GST_OBJECT_UNLOCK (pad); return result; diff --git a/gst/gstpad.h b/gst/gstpad.h index 1fe6318..51e30a7 100644 --- a/gst/gstpad.h +++ b/gst/gstpad.h @@ -227,15 +227,6 @@ typedef enum { GST_ACTIVATE_PULL } GstActivateMode; -/** - * GST_PAD_MODE_ACTIVATE: - * @mode: a #GstActivateMode - * - * Macro to test if the given #GstActivateMode value indicates that datapassing - * is possible or not. - */ -#define GST_PAD_MODE_ACTIVATE(mode) ((mode) != GST_ACTIVATE_NONE) - /* pad states */ /** * GstPadActivateFunction: @@ -718,6 +709,8 @@ struct _GstPadClass { #define GST_PAD_IS_LINKED(pad) (GST_PAD_PEER(pad) != NULL) +#define GST_PAD_IS_ACTIVE(pad) (GST_PAD_ACTIVATE_MODE(pad) != GST_ACTIVATE_NONE) + #define GST_PAD_IS_BLOCKED(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_BLOCKED)) #define GST_PAD_IS_BLOCKING(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_BLOCKING)) #define GST_PAD_IS_FLUSHING(pad) (GST_OBJECT_FLAG_IS_SET (pad, GST_PAD_FLUSHING)) -- 2.7.4