[farsight2/master] Replace recursive mutex with a regular mutex

Olivier Crête olivier.crete at collabora.co.uk
Fri Dec 12 17:15:03 PST 2008


---
 gst/fsrtpconference/fs-rtp-session.c |    4 ++--
 gst/fsrtpconference/fs-rtp-session.h |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 6b791c7..75fedc3 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -368,7 +368,7 @@ fs_rtp_session_init (FsRtpSession *self)
   self->priv->transmitters = g_hash_table_new_full (g_str_hash, g_str_equal,
     g_free, g_object_unref);
 
-  g_static_rec_mutex_init (&self->mutex);
+  g_static_mutex_init (&self->mutex);
 
   self->priv->media_type = FS_MEDIA_TYPE_LAST + 1;
 
@@ -660,7 +660,7 @@ fs_rtp_session_finalize (GObject *object)
 {
   FsRtpSession *self = FS_RTP_SESSION (object);
 
-  g_static_rec_mutex_free (&self->mutex);
+  g_static_mutex_free (&self->mutex);
 
   if (self->priv->codec_preferences)
     fs_codec_list_destroy (self->priv->codec_preferences);
diff --git a/gst/fsrtpconference/fs-rtp-session.h b/gst/fsrtpconference/fs-rtp-session.h
index c919be7..6e48254 100644
--- a/gst/fsrtpconference/fs-rtp-session.h
+++ b/gst/fsrtpconference/fs-rtp-session.h
@@ -70,15 +70,15 @@ struct _FsRtpSession
   /* This ID can be accessed by the stream/substreams for this session */
   guint id;
 
-  GStaticRecMutex mutex; /* Should only be accessed using the macros */
+  GStaticMutex mutex; /* Should only be accessed using the macros */
 
   FsRtpSessionPrivate *priv;
 };
 
 #define FS_RTP_SESSION_LOCK(session) \
-  g_static_rec_mutex_lock (&FS_RTP_SESSION (session)->mutex)
+  g_static_mutex_lock (&FS_RTP_SESSION (session)->mutex)
 #define FS_RTP_SESSION_UNLOCK(session) \
-  g_static_rec_mutex_unlock (&FS_RTP_SESSION (session)->mutex)
+  g_static_mutex_unlock (&FS_RTP_SESSION (session)->mutex)
 
 
 GType fs_rtp_session_get_type (void);
-- 
1.5.6.5




More information about the farsight-commits mailing list