chromahold: deprecated GStaticMutex -> GMutex

https://bugzilla.gnome.org/show_bug.cgi?id=693322
This commit is contained in:
Marc Leeman 2013-02-07 11:54:06 +01:00 committed by Tim-Philipp Müller
parent be07743a9e
commit f7b16f6185
2 changed files with 5 additions and 5 deletions

View file

@ -86,14 +86,14 @@ GST_STATIC_PAD_TEMPLATE ("sink",
#define GST_CHROMA_HOLD_LOCK(self) G_STMT_START { \ #define GST_CHROMA_HOLD_LOCK(self) G_STMT_START { \
GST_LOG_OBJECT (self, "Locking chromahold from thread %p", g_thread_self ()); \ GST_LOG_OBJECT (self, "Locking chromahold from thread %p", g_thread_self ()); \
g_static_mutex_lock (&self->lock); \ g_mutex_lock (&self->lock); \
GST_LOG_OBJECT (self, "Locked chromahold from thread %p", g_thread_self ()); \ GST_LOG_OBJECT (self, "Locked chromahold from thread %p", g_thread_self ()); \
} G_STMT_END } G_STMT_END
#define GST_CHROMA_HOLD_UNLOCK(self) G_STMT_START { \ #define GST_CHROMA_HOLD_UNLOCK(self) G_STMT_START { \
GST_LOG_OBJECT (self, "Unlocking chromahold from thread %p", \ GST_LOG_OBJECT (self, "Unlocking chromahold from thread %p", \
g_thread_self ()); \ g_thread_self ()); \
g_static_mutex_unlock (&self->lock); \ g_mutex_unlock (&self->lock); \
} G_STMT_END } G_STMT_END
static gboolean gst_chroma_hold_start (GstBaseTransform * trans); static gboolean gst_chroma_hold_start (GstBaseTransform * trans);
@ -176,7 +176,7 @@ gst_chroma_hold_init (GstChromaHold * self)
self->target_b = DEFAULT_TARGET_B; self->target_b = DEFAULT_TARGET_B;
self->tolerance = DEFAULT_TOLERANCE; self->tolerance = DEFAULT_TOLERANCE;
g_static_mutex_init (&self->lock); g_mutex_init (&self->lock);
} }
static void static void
@ -184,7 +184,7 @@ gst_chroma_hold_finalize (GObject * object)
{ {
GstChromaHold *self = GST_CHROMA_HOLD (object); GstChromaHold *self = GST_CHROMA_HOLD (object);
g_static_mutex_free (&self->lock); g_mutex_clear (&self->lock);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }

View file

@ -50,7 +50,7 @@ struct _GstChromaHold
/* <private> */ /* <private> */
/* caps */ /* caps */
GStaticMutex lock; GMutex lock;
GstVideoFormat format; GstVideoFormat format;
gint width, height; gint width, height;