From d2d19eb1e63750432af1d0da96bdb0003d4f2852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 22 Dec 2012 11:42:52 +0100 Subject: [PATCH] d3dvideosink: Update to new GLib threading API --- sys/d3dvideosink/d3dvideosink.c | 6 +++--- sys/d3dvideosink/d3dvideosink.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/d3dvideosink/d3dvideosink.c b/sys/d3dvideosink/d3dvideosink.c index 4c39317a73..9bc9364452 100644 --- a/sys/d3dvideosink/d3dvideosink.c +++ b/sys/d3dvideosink/d3dvideosink.c @@ -163,7 +163,7 @@ gst_d3dvideosink_class_init (GstD3DVideoSinkClass * klass) gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&sink_template)); - g_static_rec_mutex_init (&klass->lock); + g_rec_mutex_init (&klass->lock); } static void @@ -182,7 +182,7 @@ gst_d3dvideosink_init (GstD3DVideoSink * sink) sink->stream_stop_on_close = DEFAULT_STREAM_STOP_ON_CLOSE; sink->enable_navigation_events = DEFAULT_ENABLE_NAVIGATION_EVENTS; - g_static_rec_mutex_init (&sink->lock); + g_rec_mutex_init (&sink->lock); } /** GObject Functions **/ @@ -196,7 +196,7 @@ gst_d3dvideosink_finalize (GObject * gobject) d3d_class_destroy (sink); - g_static_rec_mutex_free (&sink->lock); + g_rec_mutex_clear (&sink->lock); G_OBJECT_CLASS (gst_d3dvideosink_parent_class)->finalize (gobject); } diff --git a/sys/d3dvideosink/d3dvideosink.h b/sys/d3dvideosink/d3dvideosink.h index fe00f7fe13..2c43a8af66 100644 --- a/sys/d3dvideosink/d3dvideosink.h +++ b/sys/d3dvideosink/d3dvideosink.h @@ -80,7 +80,7 @@ struct _GstD3DVideoSink GstVideoRectangle render_rect; - GStaticRecMutex lock; + GRecMutex lock; /* Properties */ gboolean force_aspect_ratio; @@ -93,7 +93,7 @@ struct _GstD3DVideoSinkClass { GstVideoSinkClass parent_class; GstD3DDataClass d3d; - GStaticRecMutex lock; + GRecMutex lock; }; #if 1