[farsight2/master] msn: use session valve directly in stream

[Olivier Crête]

---
 gst/fsmsnconference/fs-msn-session.c |    2 +-
 gst/fsmsnconference/fs-msn-stream.c  |   10 +++-------
 gst/fsmsnconference/fs-msn-stream.h  |    1 -
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/gst/fsmsnconference/fs-msn-session.c b/gst/fsmsnconference/fs-msn-session.c
index ab58dc2..4c33d63 100644
--- a/gst/fsmsnconference/fs-msn-session.c
+++ b/gst/fsmsnconference/fs-msn-session.c
@@ -499,7 +499,7 @@ fs_msn_session_new_stream (FsSession *session,
   msnparticipant = FS_MSN_PARTICIPANT (participant);
 
   new_stream = FS_STREAM_CAST (fs_msn_stream_new (self, msnparticipant,
-          direction, conference, self->valve,
+          direction, conference,
           self->priv->session_id, self->priv->initial_port, error));
 
   if (new_stream)
diff --git a/gst/fsmsnconference/fs-msn-stream.c b/gst/fsmsnconference/fs-msn-stream.c
index fe92a82..776f90a 100644
--- a/gst/fsmsnconference/fs-msn-stream.c
+++ b/gst/fsmsnconference/fs-msn-stream.c
@@ -70,7 +70,6 @@ struct _FsMsnStreamPrivate
   FsMsnParticipant *participant;
   FsStreamDirection direction;
   FsMsnConference *conference;
-  GstElement *session_valve;
   GstElement *recv_valve;
   GstPad *src_pad;
   FsMsnConnection *connection;
@@ -260,12 +259,12 @@ fs_msn_stream_set_property (GObject *object,
         {
           if (self->priv->recv_valve)
             g_object_set (self->priv->recv_valve, "drop", TRUE, NULL);
-          g_object_set (self->priv->session_valve, "drop", TRUE, NULL);
+          g_object_set (self->priv->session->valve, "drop", TRUE, NULL);
         }
         else if (self->priv->direction == FS_DIRECTION_SEND)
         {
           if (self->priv->codecbin)
-            g_object_set (self->priv->session_valve, "drop", FALSE, NULL);
+            g_object_set (self->priv->session->valve, "drop", FALSE, NULL);
         }
         else if (self->priv->direction == FS_DIRECTION_RECV)
         {
@@ -490,7 +489,7 @@ _connected (
   }
   else
   {
-    GstPad *valvepad = gst_element_get_static_pad (self->priv->session_valve,
+    GstPad *valvepad = gst_element_get_static_pad (self->priv->session->valve,
         "src");
 
     if (!valvepad)
@@ -560,7 +559,6 @@ fs_msn_stream_new (FsMsnSession *session,
     FsMsnParticipant *participant,
     FsStreamDirection direction,
     FsMsnConference *conference,
-    GstElement *session_valve,
     guint session_id,
     guint initial_port,
     GError **error)
@@ -585,8 +583,6 @@ fs_msn_stream_new (FsMsnSession *session,
     return NULL;
   }
 
-  self->priv->session_valve = session_valve;
-
   self->priv->connection = fs_msn_connection_new (session_id, initial_port);
 
   g_signal_connect (self->priv->connection,
diff --git a/gst/fsmsnconference/fs-msn-stream.h b/gst/fsmsnconference/fs-msn-stream.h
index 66e9c36..5b7ca61 100644
--- a/gst/fsmsnconference/fs-msn-stream.h
+++ b/gst/fsmsnconference/fs-msn-stream.h
@@ -77,7 +77,6 @@ FsMsnStream *fs_msn_stream_new (FsMsnSession *session,
     FsMsnParticipant *participant,
     FsStreamDirection direction,
     FsMsnConference *conference,
-    GstElement *session_valve,
     guint session_id,
     guint initial_port,
     GError **error);
-- 
1.5.6.5