diff options
author | Olivier CrĂȘte <olivier.crete@collabora.com> | 2012-09-25 15:08:26 -0400 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.com> | 2012-09-25 16:23:53 -0400 |
commit | dfcbd4cbcf111d6cfe6c174c4fdb5a9235062cf9 (patch) | |
tree | 168f70df15e0f7cf7d5d51ebbae320c8be5d9f1a /transmitters/shm | |
parent | 224a49a5c784efbe6bc4b9e8c7632332efcf7456 (diff) | |
download | farstream-dfcbd4cbcf111d6cfe6c174c4fdb5a9235062cf9.tar.gz |
Port to GLib 2.32
Diffstat (limited to 'transmitters/shm')
-rw-r--r-- | transmitters/shm/fs-shm-stream-transmitter.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/transmitters/shm/fs-shm-stream-transmitter.c b/transmitters/shm/fs-shm-stream-transmitter.c index 23c45f26..abc43b2e 100644 --- a/transmitters/shm/fs-shm-stream-transmitter.c +++ b/transmitters/shm/fs-shm-stream-transmitter.c @@ -110,7 +110,7 @@ struct _FsShmStreamTransmitterPrivate GList *preferred_local_candidates; - GMutex *mutex; + GMutex mutex; /* Protected by the mutex */ gboolean sending; @@ -134,9 +134,9 @@ struct _FsShmStreamTransmitterPrivate FsShmStreamTransmitterPrivate)) #define FS_SHM_STREAM_TRANSMITTER_LOCK(s) \ - g_mutex_lock ((s)->priv->mutex) + g_mutex_lock (&(s)->priv->mutex) #define FS_SHM_STREAM_TRANSMITTER_UNLOCK(s) \ - g_mutex_unlock ((s)->priv->mutex) + g_mutex_unlock (&(s)->priv->mutex) static void fs_shm_stream_transmitter_class_init (FsShmStreamTransmitterClass *klass); static void fs_shm_stream_transmitter_init (FsShmStreamTransmitter *self); @@ -242,7 +242,7 @@ fs_shm_stream_transmitter_init (FsShmStreamTransmitter *self) self->priv->sending = TRUE; - self->priv->mutex = g_mutex_new (); + g_mutex_init (&self->priv->mutex); } static void @@ -283,7 +283,7 @@ fs_shm_stream_transmitter_finalize (GObject *object) g_free (self->priv->shm_src); g_free (self->priv->shm_sink); - g_mutex_free (self->priv->mutex); + g_mutex_clear (&self->priv->mutex); parent_class->finalize (object); } |