[farsight2/master] Add forgotten lock and point lock macro to the right object

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:21:10 PST 2008


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

diff --git a/gst/fsrtpconference/fs-rtp-substream.c b/gst/fsrtpconference/fs-rtp-substream.c
index 524d50a..c395850 100644
--- a/gst/fsrtpconference/fs-rtp-substream.c
+++ b/gst/fsrtpconference/fs-rtp-substream.c
@@ -504,9 +504,9 @@ fs_rtp_sub_stream_get_property (GObject *object,
       FS_RTP_SESSION_UNLOCK (self->priv->session);
       break;
     case PROP_NO_RTCP_TIMEOUT:
-      FS_RTP_SESSION_LOCK (self);
+      FS_RTP_SESSION_LOCK (self->priv->session);
       g_value_set_int (value, self->priv->no_rtcp_timeout);
-      FS_RTP_SESSION_UNLOCK (self);
+      FS_RTP_SESSION_UNLOCK (self->priv->session);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -805,6 +805,8 @@ _rtpbin_pad_have_data_callback (GstPad *pad, GstMiniObject *miniobj,
   GError *error = NULL;
   gboolean success = FALSE;
 
+  FS_RTP_SESSION_LOCK (self->priv->session);
+
   codec = fs_rtp_session_get_recv_codec_for_pt (self->priv->session,
       self->priv->pt);
 
-- 
1.5.6.5




More information about the farsight-commits mailing list