diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-22 23:15:19 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-22 23:15:19 +0000 |
| commit | 7cb9b7ab9db548eca8a67883b010dd14d2efd07e (patch) | |
| tree | 9bb89dfc5492ca7945541013bc9992485a775f72 /gst/alpha | |
| parent | ba2ec3ff984262eceb6fdeeed08cefcaee045b15 (diff) | |
Use new GLib API unconditionally
Diffstat (limited to 'gst/alpha')
| -rw-r--r-- | gst/alpha/gstalpha.c | 21 | ||||
| -rw-r--r-- | gst/alpha/gstalpha.h | 4 |
2 files changed, 0 insertions, 25 deletions
diff --git a/gst/alpha/gstalpha.c b/gst/alpha/gstalpha.c index 325bdc53b..4b53a80ce 100644 --- a/gst/alpha/gstalpha.c +++ b/gst/alpha/gstalpha.c @@ -146,18 +146,6 @@ static GstStaticCaps gst_alpha_alpha_caps = GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ AYUV, ARGB, BGRA, ABGR, RGBA }")); /* FIXME: why do we need our own lock for this? */ -#if !GLIB_CHECK_VERSION (2, 31, 0) -#define GST_ALPHA_LOCK(alpha) G_STMT_START { \ - GST_LOG_OBJECT (alpha, "Locking alpha from thread %p", g_thread_self ()); \ - g_static_mutex_lock (&alpha->lock); \ - GST_LOG_OBJECT (alpha, "Locked alpha from thread %p", g_thread_self ()); \ -} G_STMT_END - -#define GST_ALPHA_UNLOCK(alpha) G_STMT_START { \ - GST_LOG_OBJECT (alpha, "Unlocking alpha from thread %p", g_thread_self ()); \ - g_static_mutex_unlock (&alpha->lock); \ -} G_STMT_END -#else #define GST_ALPHA_LOCK(alpha) G_STMT_START { \ GST_LOG_OBJECT (alpha, "Locking alpha from thread %p", g_thread_self ()); \ g_mutex_lock (&alpha->lock); \ @@ -168,7 +156,6 @@ GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ AYUV, ARGB, BGRA, ABGR, RGBA }")); GST_LOG_OBJECT (alpha, "Unlocking alpha from thread %p", g_thread_self ()); \ g_mutex_unlock (&alpha->lock); \ } G_STMT_END -#endif static GstCaps *gst_alpha_transform_caps (GstBaseTransform * btrans, GstPadDirection direction, GstCaps * caps, GstCaps * filter); @@ -310,11 +297,7 @@ gst_alpha_init (GstAlpha * alpha) alpha->black_sensitivity = DEFAULT_BLACK_SENSITIVITY; alpha->white_sensitivity = DEFAULT_WHITE_SENSITIVITY; -#if !GLIB_CHECK_VERSION (2, 31, 0) - g_static_mutex_init (&alpha->lock); -#else g_mutex_init (&alpha->lock); -#endif } static void @@ -322,11 +305,7 @@ gst_alpha_finalize (GObject * object) { GstAlpha *alpha = GST_ALPHA (object); -#if !GLIB_CHECK_VERSION (2, 31, 0) - g_static_mutex_free (&alpha->lock); -#else g_mutex_clear (&alpha->lock); -#endif G_OBJECT_CLASS (parent_class)->finalize (object); } diff --git a/gst/alpha/gstalpha.h b/gst/alpha/gstalpha.h index 48592f1bb..a3131341d 100644 --- a/gst/alpha/gstalpha.h +++ b/gst/alpha/gstalpha.h @@ -69,11 +69,7 @@ struct _GstAlpha /* <private> */ /* caps */ -#if !GLIB_CHECK_VERSION (2, 31, 0) - GStaticMutex lock; -#else GMutex lock; -#endif gboolean in_sdtv, out_sdtv; |