From c683e39429429b457df62f50d14ac875dcd92e98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 8 Mar 2012 16:26:44 +0000 Subject: [PATCH] pads, collectpads2: get rid of superfluous brackets around static rec mutex calls Makes it possible to define those calls to something for tracing. --- gst/gstpad.h | 10 +++++----- libs/gst/base/gstcollectpads2.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gst/gstpad.h b/gst/gstpad.h index 8990fdc..ef0c146 100644 --- a/gst/gstpad.h +++ b/gst/gstpad.h @@ -828,7 +828,7 @@ struct _GstPadClass { * * Lock the stream lock of @pad. */ -#define GST_PAD_STREAM_LOCK(pad) (g_static_rec_mutex_lock(GST_PAD_GET_STREAM_LOCK(pad))) +#define GST_PAD_STREAM_LOCK(pad) g_static_rec_mutex_lock(GST_PAD_GET_STREAM_LOCK(pad)) /** * GST_PAD_STREAM_LOCK_FULL: * @pad: a #GstPad @@ -836,7 +836,7 @@ struct _GstPadClass { * * Lock the stream lock of @pad @t times. */ -#define GST_PAD_STREAM_LOCK_FULL(pad,t) (g_static_rec_mutex_lock_full(GST_PAD_GET_STREAM_LOCK(pad), t)) +#define GST_PAD_STREAM_LOCK_FULL(pad,t) g_static_rec_mutex_lock_full(GST_PAD_GET_STREAM_LOCK(pad), t) /** * GST_PAD_STREAM_TRYLOCK: * @pad: a #GstPad @@ -844,14 +844,14 @@ struct _GstPadClass { * Try to Lock the stream lock of the pad, return TRUE if the lock could be * taken. */ -#define GST_PAD_STREAM_TRYLOCK(pad) (g_static_rec_mutex_trylock(GST_PAD_GET_STREAM_LOCK(pad))) +#define GST_PAD_STREAM_TRYLOCK(pad) g_static_rec_mutex_trylock(GST_PAD_GET_STREAM_LOCK(pad)) /** * GST_PAD_STREAM_UNLOCK: * @pad: a #GstPad * * Unlock the stream lock of @pad. */ -#define GST_PAD_STREAM_UNLOCK(pad) (g_static_rec_mutex_unlock(GST_PAD_GET_STREAM_LOCK(pad))) +#define GST_PAD_STREAM_UNLOCK(pad) g_static_rec_mutex_unlock(GST_PAD_GET_STREAM_LOCK(pad)) /** * GST_PAD_STREAM_UNLOCK_FULL: * @pad: a #GstPad @@ -859,7 +859,7 @@ struct _GstPadClass { * Fully unlock the recursive stream lock of @pad, return the number of times * @pad was locked. */ -#define GST_PAD_STREAM_UNLOCK_FULL(pad) (g_static_rec_mutex_unlock_full(GST_PAD_GET_STREAM_LOCK(pad))) +#define GST_PAD_STREAM_UNLOCK_FULL(pad) g_static_rec_mutex_unlock_full(GST_PAD_GET_STREAM_LOCK(pad)) #define GST_PAD_GET_PREROLL_LOCK(pad) (GST_PAD_CAST(pad)->preroll_lock) #define GST_PAD_PREROLL_LOCK(pad) (g_mutex_lock(GST_PAD_GET_PREROLL_LOCK(pad))) diff --git a/libs/gst/base/gstcollectpads2.h b/libs/gst/base/gstcollectpads2.h index 73b76f5..1fb0085 100644 --- a/libs/gst/base/gstcollectpads2.h +++ b/libs/gst/base/gstcollectpads2.h @@ -260,7 +260,7 @@ typedef GstFlowReturn (*GstCollectPads2ClipFunction) (GstCollectPads2 *pads, Gst * * Since: 0.10.36 */ -#define GST_COLLECT_PADS2_STREAM_LOCK(pads) (g_static_rec_mutex_lock(GST_COLLECT_PADS2_GET_STREAM_LOCK (pads))) +#define GST_COLLECT_PADS2_STREAM_LOCK(pads) g_static_rec_mutex_lock(GST_COLLECT_PADS2_GET_STREAM_LOCK (pads)) /** * GST_COLLECT_PADS2_STREAM_UNLOCK: * @pads: a #GstCollectPads2 @@ -269,7 +269,7 @@ typedef GstFlowReturn (*GstCollectPads2ClipFunction) (GstCollectPads2 *pads, Gst * * Since: 0.10.36 */ -#define GST_COLLECT_PADS2_STREAM_UNLOCK(pads) (g_static_rec_mutex_unlock(GST_COLLECT_PADS2_GET_STREAM_LOCK (pads))) +#define GST_COLLECT_PADS2_STREAM_UNLOCK(pads) g_static_rec_mutex_unlock(GST_COLLECT_PADS2_GET_STREAM_LOCK (pads)) /** * GstCollectPads2: -- 2.7.4