transmitter: Remove recvonly-filter

It was pretty much useless anyway.

9 files changed, 72 insertions, 342 deletions

diff --git a/transmitters/multicast/fs-multicast-stream-transmitter.c b/transmitters/multicast/fs-multicast-stream-transmitter.c
index 2f4c73da..eb134b4f 100644
--- a/transmitters/multicast/fs-multicast-stream-transmitter.c
+++ b/transmitters/multicast/fs-multicast-stream-transmitter.c
@@ -227,7 +227,6 @@ static void
 fs_multicast_stream_transmitter_dispose (GObject *object)
 {
   FsMulticastStreamTransmitter *self = FS_MULTICAST_STREAM_TRANSMITTER (object);
-  gint c;
 
   if (self->priv->disposed)
     /* If dispose did already run, return. */
@@ -235,17 +234,14 @@ fs_multicast_stream_transmitter_dispose (GObject *object)
 
   if (self->priv->udpsocks)
   {
-    for (c = 1; c <= self->priv->transmitter->components; c++)
+    if (self->priv->udpsocks[1])
     {
-      if (self->priv->udpsocks[c])
-      {
-        if (self->priv->sending)
-          fs_multicast_transmitter_udpsock_dec_sending (
-              self->priv->udpsocks[c]);
-        fs_multicast_transmitter_put_udpsock (self->priv->transmitter,
-            self->priv->udpsocks[c], self->priv->remote_candidate[c]->ttl);
-        self->priv->udpsocks[c] = NULL;
-      }
+      if (self->priv->sending)
+        fs_multicast_transmitter_udpsock_dec_sending (
+            self->priv->udpsocks[1]);
+      fs_multicast_transmitter_put_udpsock (self->priv->transmitter,
+          self->priv->udpsocks[1], self->priv->remote_candidate[1]->ttl);
+      self->priv->udpsocks[1] = NULL;
     }
   }
 
@@ -336,29 +332,27 @@ fs_multicast_stream_transmitter_set_property (GObject *object,
       {
         gboolean old_sending = self->priv->sending;
         gboolean sending = g_value_get_boolean (value);
-        gint c;
 
         FS_MULTICAST_STREAM_TRANSMITTER_LOCK (self);
         self->priv->sending = sending;
 
         if (sending != old_sending)
-          for (c = 1; c <= self->priv->transmitter->components; c++)
-            if (self->priv->udpsocks[c])
-            {
-              guint8 ttl = self->priv->remote_candidate[c]->ttl;
-              fs_multicast_transmitter_udpsock_ref (self->priv->transmitter,
-                  self->priv->udpsocks[c], ttl);
-              FS_MULTICAST_STREAM_TRANSMITTER_UNLOCK (self);
-              if (sending)
-                fs_multicast_transmitter_udpsock_inc_sending (
-                    self->priv->udpsocks[c]);
-              else
-                fs_multicast_transmitter_udpsock_dec_sending (
-                    self->priv->udpsocks[c]);
-              fs_multicast_transmitter_put_udpsock (self->priv->transmitter,
-                  self->priv->udpsocks[c], ttl);
-              FS_MULTICAST_STREAM_TRANSMITTER_LOCK (self);
-            }
+          if (self->priv->udpsocks[1])
+          {
+            guint8 ttl = self->priv->remote_candidate[1]->ttl;
+            fs_multicast_transmitter_udpsock_ref (self->priv->transmitter,
+                self->priv->udpsocks[1], ttl);
+            FS_MULTICAST_STREAM_TRANSMITTER_UNLOCK (self);
+            if (sending)
+              fs_multicast_transmitter_udpsock_inc_sending (
+                  self->priv->udpsocks[1]);
+            else
+              fs_multicast_transmitter_udpsock_dec_sending (
+                  self->priv->udpsocks[1]);
+            fs_multicast_transmitter_put_udpsock (self->priv->transmitter,
+                self->priv->udpsocks[1], ttl);
+            FS_MULTICAST_STREAM_TRANSMITTER_LOCK (self);
+          }
         FS_MULTICAST_STREAM_TRANSMITTER_UNLOCK (self);
 
       }
@@ -489,7 +483,7 @@ fs_multicast_stream_transmitter_add_remote_candidate (
       candidate->ip,
       candidate->port,
       candidate->ttl,
-      self->priv->sending,
+      candidate->component_id == 1 ? self->priv->sending : TRUE,
       error);
 
   if (!newudpsock)
@@ -497,7 +491,8 @@ fs_multicast_stream_transmitter_add_remote_candidate (
 
   FS_MULTICAST_STREAM_TRANSMITTER_LOCK (self);
 
-  if (self->priv->udpsocks[candidate->component_id])
+  if (self->priv->udpsocks[candidate->component_id] &&
+      candidate->component_id == 1)
   {
     if (self->priv->sending)
       fs_multicast_transmitter_udpsock_dec_sending (
diff --git a/transmitters/multicast/fs-multicast-transmitter.c b/transmitters/multicast/fs-multicast-transmitter.c
index 93beb702..1f9eaf1d 100644
--- a/transmitters/multicast/fs-multicast-transmitter.c
+++ b/transmitters/multicast/fs-multicast-transmitter.c
@@ -521,7 +521,6 @@ struct _UdpSock {
   GstPad *udpsrc_requested_pad;
 
   GstElement *udpsink;
-  GstElement *udpsink_recvonly_filter;
   GstPad *udpsink_requested_pad;
 
   gchar *local_ip;
@@ -715,7 +714,7 @@ _bind_port (
 
 static GstElement *
 _create_sinksource (gchar *elementname, GstBin *bin,
-    GstElement *teefunnel, GstElement *filter, GSocket *socket,
+    GstElement *teefunnel, GSocket *socket,
     GstPadDirection direction, GstPad **requested_pad, GError **error)
 {
   GstElement *elem;
@@ -764,53 +763,6 @@ _create_sinksource (gchar *elementname, GstBin *bin,
   else
     elempad = gst_element_get_static_pad (elem, "src");
 
-  if (filter)
-  {
-    GstPad *filterpad = NULL;
-
-    if (!gst_bin_add (bin, filter))
-    {
-      g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
-          "Could not add the filter element to the gst %s bin",
-          (direction == GST_PAD_SINK) ? "sink" : "src");
-      goto error;
-    }
-
-    if (direction == GST_PAD_SINK)
-      filterpad = gst_element_get_static_pad (filter, "src");
-    else
-      filterpad = gst_element_get_static_pad (filter, "sink");
-
-    if (direction == GST_PAD_SINK)
-      ret = gst_pad_link (filterpad, elempad);
-    else
-      ret = gst_pad_link (elempad, filterpad);
-
-    gst_object_unref (elempad);
-    gst_object_unref (filterpad);
-    elempad = NULL;
-
-    if (GST_PAD_LINK_FAILED(ret))
-    {
-      g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
-          "Could not link the new element %s (%d)", elementname, ret);
-      goto error;
-    }
-
-    if (direction == GST_PAD_SINK)
-      elempad = gst_element_get_static_pad (filter, "sink");
-    else
-      elempad = gst_element_get_static_pad (filter, "src");
-
-
-    if (!gst_element_sync_state_with_parent (filter))
-    {
-      g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
-          "Could not sync the state of the new filte rwith its parent");
-      goto error;
-    }
-  }
-
   if (direction != GST_PAD_SINK)
     ret = gst_pad_link (elempad, *requested_pad);
 
@@ -973,17 +925,13 @@ fs_multicast_transmitter_get_udpsock (FsMulticastTransmitter *trans,
   udpsock->funnel = trans->priv->udpsrc_funnels[component_id];
 
   udpsock->udpsrc = _create_sinksource ("udpsrc",
-      GST_BIN (trans->priv->gst_src), udpsock->funnel, NULL, udpsock->socket,
+      GST_BIN (trans->priv->gst_src), udpsock->funnel, udpsock->socket,
       GST_PAD_SRC, &udpsock->udpsrc_requested_pad, error);
   if (!udpsock->udpsrc)
     goto error;
 
-  udpsock->udpsink_recvonly_filter = fs_transmitter_get_recvonly_filter (
-      FS_TRANSMITTER (trans), udpsock->component_id);
-
   udpsock->udpsink = _create_sinksource ("multiudpsink",
       GST_BIN (trans->priv->gst_sink), udpsock->tee,
-      udpsock->udpsink_recvonly_filter,
       udpsock->socket, GST_PAD_SINK, &udpsock->udpsink_requested_pad, error);
   if (!udpsock->udpsink)
     goto error;
@@ -1016,13 +964,6 @@ fs_multicast_transmitter_get_udpsock (FsMulticastTransmitter *trans,
     g_list_prepend (trans->priv->udpsocks[component_id], udpsock);
   FS_MULTICAST_TRANSMITTER_UNLOCK (trans);
 
-  if (udpsock->udpsink_recvonly_filter)
-  {
-    g_object_set (udpsock->udpsink_recvonly_filter, "sending", sending, NULL);
-    g_signal_emit_by_name (udpsock->udpsink, "add", udpsock->multicast_ip,
-        udpsock->port);
-  }
-
   if (sending)
     fs_multicast_transmitter_udpsock_inc_sending (udpsock);
 
@@ -1128,20 +1069,6 @@ fs_multicast_transmitter_put_udpsock (FsMulticastTransmitter *trans,
       GST_ERROR ("Could not remove udpsink element from transmitter source");
   }
 
-  if (udpsock->udpsink_recvonly_filter)
-  {
-    GstStateChangeReturn ret;
-    gst_element_set_locked_state (udpsock->udpsink_recvonly_filter, TRUE);
-    ret = gst_element_set_state (udpsock->udpsink_recvonly_filter,
-        GST_STATE_NULL);
-    if (ret != GST_STATE_CHANGE_SUCCESS)
-      GST_ERROR ("Error changing state of udpsink filter: %s",
-          gst_element_state_change_return_get_name (ret));
-    if (!gst_bin_remove (GST_BIN (trans->priv->gst_sink),
-            udpsock->udpsink_recvonly_filter))
-      GST_ERROR ("Could not remove sink filter element from transmitter sink");
-  }
-
   if (udpsock->socket)
     g_object_unref (udpsock->socket);
 
@@ -1159,11 +1086,8 @@ fs_multicast_transmitter_udpsock_inc_sending (UdpSock *udpsock)
 {
   if (g_atomic_int_add (&udpsock->sendcount, 1) == 0)
   {
-    if (udpsock->udpsink_recvonly_filter)
-      g_object_set (udpsock->udpsink_recvonly_filter, "sending", TRUE, NULL);
-    else
-      g_signal_emit_by_name (udpsock->udpsink, "add", udpsock->multicast_ip,
-          udpsock->port);
+    g_signal_emit_by_name (udpsock->udpsink, "add", udpsock->multicast_ip,
+        udpsock->port);
 
     gst_element_send_event (udpsock->udpsink,
         gst_event_new_custom (GST_EVENT_CUSTOM_UPSTREAM,
@@ -1178,11 +1102,8 @@ fs_multicast_transmitter_udpsock_dec_sending (UdpSock *udpsock)
 {
   if (g_atomic_int_dec_and_test (&udpsock->sendcount))
   {
-    if (udpsock->udpsink_recvonly_filter)
-      g_object_set (udpsock->udpsink_recvonly_filter, "sending", FALSE, NULL);
-    else
-      g_signal_emit_by_name (udpsock->udpsink, "remove", udpsock->multicast_ip,
-          udpsock->port);
+    g_signal_emit_by_name (udpsock->udpsink, "remove", udpsock->multicast_ip,
+        udpsock->port);
   }
 }
 
diff --git a/transmitters/nice/fs-nice-transmitter.c b/transmitters/nice/fs-nice-transmitter.c
index 7674c868..0de6b4ea 100644
--- a/transmitters/nice/fs-nice-transmitter.c
+++ b/transmitters/nice/fs-nice-transmitter.c
@@ -487,7 +487,6 @@ _create_sinksource (
     gchar *elementname,
     GstBin *bin,
     GstElement *teefunnel,
-    GstElement *filter,
     NiceAgent *agent,
     guint stream_id,
     guint component_id,
@@ -561,53 +560,6 @@ _create_sinksource (
   else
     elempad = gst_element_get_static_pad (elem, "src");
 
-
-  if (filter)
-  {
-    GstPad *filterpad = NULL;
-
-    if (!gst_bin_add (bin, filter))
-    {
-      g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
-          "Could not add the filter element to the gst %s bin",
-          (direction == GST_PAD_SINK) ? "sink" : "src");
-      goto error;
-    }
-
-    if (direction == GST_PAD_SINK)
-      filterpad = gst_element_get_static_pad (filter, "src");
-    else
-      filterpad = gst_element_get_static_pad (filter, "sink");
-
-    if (direction == GST_PAD_SINK)
-      ret = gst_pad_link (filterpad, elempad);
-    else
-      ret = gst_pad_link (elempad, filterpad);
-
-    gst_object_unref (elempad);
-    gst_object_unref (filterpad);
-    elempad = NULL;
-
-    if (GST_PAD_LINK_FAILED(ret))
-    {
-      g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
-          "Could not link the new element %s (%d)", elementname, ret);
-      goto error;
-    }
-
-    if (direction == GST_PAD_SINK)
-      elempad = gst_element_get_static_pad (filter, "sink");
-    else
-      elempad = gst_element_get_static_pad (filter, "src");
-
-    if (!gst_element_sync_state_with_parent (filter))
-    {
-      g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
-          "Could not sync the state of the new filte rwith its parent");
-      goto error;
-    }
-  }
-
   if (direction != GST_PAD_SINK)
     ret = gst_pad_link (elempad, *requested_pad);
 
@@ -689,7 +641,6 @@ _create_sinksource (
 struct _NiceGstStream {
   GstElement **nicesrcs;
   GstElement **nicesinks;
-  GstElement **recvonly_filters;
 
   GstPad **requested_funnel_pads;
   GstPad **requested_tee_pads;
@@ -721,7 +672,6 @@ fs_nice_transmitter_add_gst_stream (FsNiceTransmitter *self,
   g_mutex_init (&ns->mutex);
   ns->nicesrcs = g_new0 (GstElement *, self->components + 1);
   ns->nicesinks = g_new0 (GstElement *, self->components + 1);
-  ns->recvonly_filters = g_new0 (GstElement *, self->components + 1);
   ns->requested_tee_pads = g_new0 (GstPad *, self->components + 1);
   ns->requested_funnel_pads = g_new0 (GstPad *, self->components + 1);
   ns->probe_ids = g_new0 (gulong, self->components + 1);
@@ -731,7 +681,6 @@ fs_nice_transmitter_add_gst_stream (FsNiceTransmitter *self,
     ns->nicesrcs[c] = _create_sinksource ("nicesrc",
         GST_BIN (self->priv->gst_src),
         self->priv->src_funnels[c],
-        NULL,
         agent,
         stream_id,
         c,
@@ -746,16 +695,9 @@ fs_nice_transmitter_add_gst_stream (FsNiceTransmitter *self,
     if (ns->nicesrcs[c] == NULL)
       goto error;
 
-    ns->recvonly_filters[c] = fs_transmitter_get_recvonly_filter (
-        FS_TRANSMITTER (self), c);
-
-    if (ns->recvonly_filters[c])
-      g_object_set (ns->recvonly_filters[c], "sending", TRUE, NULL);
-
     ns->nicesinks[c] = _create_sinksource ("nicesink",
         GST_BIN (self->priv->gst_sink),
         self->priv->sink_tees[c],
-        ns->recvonly_filters[c],
         agent,
         stream_id,
         c,
@@ -833,26 +775,10 @@ fs_nice_transmitter_free_gst_stream (FsNiceTransmitter *self,
       remove_sink (self, ns, c);
       gst_object_unref (ns->nicesinks[c]);
     }
-
-    if (ns->recvonly_filters[c])
-    {
-      GstStateChangeReturn ret;
-
-      gst_element_set_locked_state (ns->recvonly_filters[c], TRUE);
-      ret = gst_element_set_state (ns->recvonly_filters[c], GST_STATE_NULL);
-      if (ret != GST_STATE_CHANGE_SUCCESS)
-        GST_ERROR ("Error changing state of nicesink: %s",
-            gst_element_state_change_return_get_name (ret));
-      if (!gst_bin_remove (GST_BIN (self->priv->gst_sink),
-              ns->recvonly_filters[c]))
-        GST_ERROR ("Could not remove the recvonly filter element from"
-            " the transmitter sink");
-    }
   }
 
   g_free (ns->nicesrcs);
   g_free (ns->nicesinks);
-  g_free (ns->recvonly_filters);
   g_free (ns->requested_tee_pads);
   g_free (ns->requested_funnel_pads);
   g_free (ns->probe_ids);
@@ -864,8 +790,6 @@ void
 fs_nice_transmitter_set_sending (FsNiceTransmitter *self,
     NiceGstStream *ns, gboolean sending)
 {
-  guint c;
-
   g_mutex_lock (&ns->mutex);
 
   ns->desired_sending = sending;
@@ -890,54 +814,39 @@ fs_nice_transmitter_set_sending (FsNiceTransmitter *self,
 
     if (current_sending)
     {
-      for (c = 1; c <= self->components; c++)
-      {
-        if (ns->recvonly_filters[c])
-          g_object_set (ns->recvonly_filters[c], "sending", FALSE, NULL);
-        else
-          remove_sink (self, ns, c);
-      }
+      remove_sink (self, ns, 1);
     }
     else
     {
-      for (c = 1; c <= self->components; c++)
-      {
-        if (ns->recvonly_filters[c])
-          g_object_set (ns->recvonly_filters[c], "sending", TRUE, NULL);
-        else
-        {
-          GstPadLinkReturn ret;
-          GstPad *elempad;
-
-          gst_element_set_locked_state (ns->nicesinks[c], FALSE);
-          if (!gst_bin_add (GST_BIN (self->priv->gst_sink), ns->nicesinks[c]))
-            GST_ERROR ("Could not add nicesink element to the transmitter"
-                " sink");
-
-          if (!gst_element_sync_state_with_parent (ns->nicesinks[c]))
-            GST_ERROR ("Could sync the state of the nicesink with its parent");
-
-
-          ns->requested_tee_pads[c] =
-            gst_element_get_request_pad (self->priv->sink_tees[c], "src_%u");
-
-          g_assert (ns->requested_tee_pads[c]);
-
-          elempad = gst_element_get_static_pad (ns->nicesinks[c], "sink");
-          ret = gst_pad_link (ns->requested_tee_pads[c], elempad);
-          if (GST_PAD_LINK_FAILED(ret))
-            GST_ERROR ("Could not link nicesink to its tee pad");
-          gst_object_unref (elempad);
-
-          fs_nice_transmitter_request_keyunit (self, ns, c);
-        }
-      }
+      GstPadLinkReturn ret;
+      GstPad *elempad;
+
+      gst_element_set_locked_state (ns->nicesinks[1], FALSE);
+      if (!gst_bin_add (GST_BIN (self->priv->gst_sink), ns->nicesinks[1]))
+        GST_ERROR ("Could not add nicesink element to the transmitter"
+            " sink");
+
+      if (!gst_element_sync_state_with_parent (ns->nicesinks[1]))
+        GST_ERROR ("Could sync the state of the nicesink with its parent");
+
+
+      ns->requested_tee_pads[1] =
+        gst_element_get_request_pad (self->priv->sink_tees[1], "src_%u");
+
+      g_assert (ns->requested_tee_pads[1]);
+
+      elempad = gst_element_get_static_pad (ns->nicesinks[1], "sink");
+      ret = gst_pad_link (ns->requested_tee_pads[1], elempad);
+      if (GST_PAD_LINK_FAILED(ret))
+        GST_ERROR ("Could not link nicesink to its tee pad");
+      gst_object_unref (elempad);
+
+      fs_nice_transmitter_request_keyunit (self, ns, 1);
     }
 
     g_mutex_lock (&ns->mutex);
 
     ns->sending = sending;
-
   }
 
   ns->modifying = FALSE;
diff --git a/transmitters/rawudp/fs-rawudp-component.c b/transmitters/rawudp/fs-rawudp-component.c
index 156450c8..f9043df8 100644
--- a/transmitters/rawudp/fs-rawudp-component.c
+++ b/transmitters/rawudp/fs-rawudp-component.c
@@ -643,11 +643,6 @@ fs_rawudp_component_stop (FsRawUdpComponent *self)
         fs_rawudp_transmitter_udpport_remove_dest (udpport,
             self->priv->remote_candidate->ip,
             self->priv->remote_candidate->port);
-      else
-        fs_rawudp_transmitter_udpport_remove_recvonly_dest (udpport,
-            self->priv->remote_candidate->ip,
-            self->priv->remote_candidate->port);
-
 
       fs_rawudp_transmitter_udpport_remove_known_address (udpport,
           self->priv->remote_address, remote_is_unique_cb, self);
@@ -761,8 +756,6 @@ fs_rawudp_component_set_property (GObject *object,
         {
           if (sending)
           {
-            fs_rawudp_transmitter_udpport_remove_recvonly_dest (
-                self->priv->udpport, candidate->ip, candidate->port);
             fs_rawudp_transmitter_udpport_add_dest (self->priv->udpport,
                 candidate->ip, candidate->port);
           }
@@ -770,8 +763,6 @@ fs_rawudp_component_set_property (GObject *object,
           {
             fs_rawudp_transmitter_udpport_remove_dest (self->priv->udpport,
                 candidate->ip, candidate->port);
-            fs_rawudp_transmitter_udpport_add_recvonly_dest (
-                self->priv->udpport, candidate->ip, candidate->port);
           }
         }
         if (candidate)
@@ -972,9 +963,6 @@ fs_rawudp_component_set_remote_candidate (FsRawUdpComponent *self,
   if (sending)
     fs_rawudp_transmitter_udpport_add_dest (self->priv->udpport,
         candidate->ip, candidate->port);
-  else
-    fs_rawudp_transmitter_udpport_add_recvonly_dest (self->priv->udpport,
-        candidate->ip, candidate->port);
 
   if (old_candidate)
   {
@@ -982,10 +970,6 @@ fs_rawudp_component_set_remote_candidate (FsRawUdpComponent *self,
       fs_rawudp_transmitter_udpport_remove_dest (self->priv->udpport,
           old_candidate->ip,
           old_candidate->port);
-    else
-      fs_rawudp_transmitter_udpport_remove_recvonly_dest (self->priv->udpport,
-          candidate->ip,
-          candidate->port);
     fs_candidate_destroy (old_candidate);
   }
 
diff --git a/transmitters/rawudp/fs-rawudp-stream-transmitter.c b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
index 94e2ba07..67e6ba49 100644
--- a/transmitters/rawudp/fs-rawudp-stream-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
@@ -480,14 +480,11 @@ fs_rawudp_stream_transmitter_set_property (GObject *object,
   {
     case PROP_SENDING:
       {
-        gint c;
-
         self->priv->sending = g_value_get_boolean (value);
 
-        for (c = 1; c <= self->priv->transmitter->components; c++)
-          if (self->priv->component[c])
-            g_object_set_property (G_OBJECT (self->priv->component[c]),
-                "sending", value);
+        if (self->priv->component[1])
+          g_object_set_property (G_OBJECT (self->priv->component[1]),
+              "sending", value);
       }
       break;
     case PROP_PREFERRED_LOCAL_CANDIDATES:
diff --git a/transmitters/rawudp/fs-rawudp-transmitter.c b/transmitters/rawudp/fs-rawudp-transmitter.c
index e4028028..4372f150 100644
--- a/transmitters/rawudp/fs-rawudp-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-transmitter.c
@@ -531,10 +531,6 @@ struct _UdpPort {
   GstElement *udpsink;
   GstPad *udpsink_requested_pad;
 
-  GstElement *recvonly_filter;
-  GstElement *recvonly_udpsink;
-  GstPad *recvonly_requested_pad;
-
   gchar *requested_ip;
   guint requested_port;
 
@@ -893,19 +889,6 @@ fs_rawudp_transmitter_get_udpport (FsRawUdpTransmitter *trans,
   if (!udpport->udpsink)
     goto error;
 
-  udpport->recvonly_filter = fs_transmitter_get_recvonly_filter (
-      FS_TRANSMITTER (trans), udpport->component_id);
-
-  if (udpport->recvonly_filter)
-  {
-    udpport->recvonly_udpsink = _create_sinksource ("multiudpsink",
-        GST_BIN (trans->priv->gst_sink), udpport->tee,
-        udpport->recvonly_filter, udpport->socket, GST_PAD_SINK, FALSE,
-        &udpport->recvonly_requested_pad, error);
-    if (!udpport->recvonly_udpsink)
-      goto error;
-  }
-
   g_mutex_lock (&trans->priv->mutex);
 
   /* Check if someone else added the same port at the same time */
@@ -988,27 +971,6 @@ fs_rawudp_transmitter_put_udpport (FsRawUdpTransmitter *trans,
       GST_ERROR ("Could not remove udpsink element from transmitter source");
   }
 
-  if (udpport->recvonly_requested_pad)
-  {
-    gst_element_release_request_pad (udpport->tee,
-        udpport->recvonly_requested_pad);
-    gst_object_unref (udpport->recvonly_requested_pad);
-  }
-
-  if (udpport->recvonly_udpsink)
-  {
-    GstStateChangeReturn ret;
-    gst_element_set_locked_state (udpport->recvonly_udpsink, TRUE);
-    ret = gst_element_set_state (udpport->recvonly_udpsink, GST_STATE_NULL);
-    if (ret != GST_STATE_CHANGE_SUCCESS)
-      GST_ERROR ("Error changing state of udpsink: %s",
-          gst_element_state_change_return_get_name (ret));
-    if (!gst_bin_remove (GST_BIN (trans->priv->gst_sink),
-            udpport->recvonly_udpsink))
-      GST_ERROR ("Could not remove udpsink element from transmitter source");
-  }
-
-
   if (udpport->socket)
     g_socket_close (udpport->socket, NULL);
   g_clear_object (&udpport->socket);
@@ -1258,25 +1220,6 @@ fs_rawudp_transmitter_udpport_remove_known_address (UdpPort *udpport,
   g_mutex_unlock (&udpport->mutex);
 }
 
-void
-fs_rawudp_transmitter_udpport_add_recvonly_dest (UdpPort *udpport,
-    const gchar *ip,
-    gint port)
-{
-  if (udpport->recvonly_udpsink)
-    g_signal_emit_by_name (udpport->recvonly_udpsink, "add", ip, port);
-}
-
-
-void
-fs_rawudp_transmitter_udpport_remove_recvonly_dest (UdpPort *udpport,
-    const gchar *ip,
-    gint port)
-{
-  if (udpport->recvonly_udpsink)
-    g_signal_emit_by_name (udpport->recvonly_udpsink, "remove", ip, port);
-}
-
 static void
 fs_rawudp_transmitter_set_type_of_service (FsRawUdpTransmitter *self,
     gint tos)
diff --git a/transmitters/rawudp/fs-rawudp-transmitter.h b/transmitters/rawudp/fs-rawudp-transmitter.h
index e8ebf173..02a71f95 100644
--- a/transmitters/rawudp/fs-rawudp-transmitter.h
+++ b/transmitters/rawudp/fs-rawudp-transmitter.h
@@ -145,14 +145,6 @@ void fs_rawudp_transmitter_udpport_remove_known_address (UdpPort *udpport,
     FsRawUdpAddressUniqueCallbackFunc callback,
     gpointer user_data);
 
-void fs_rawudp_transmitter_udpport_add_recvonly_dest (UdpPort *udpport,
-    const gchar *ip,
-    gint port);
-
-void fs_rawudp_transmitter_udpport_remove_recvonly_dest (UdpPort *udpport,
-    const gchar *ip,
-    gint port);
-
 gboolean fs_g_inet_socket_address_equal (GSocketAddress *addr1,
     GSocketAddress *addr2);
 
diff --git a/transmitters/shm/fs-shm-stream-transmitter.c b/transmitters/shm/fs-shm-stream-transmitter.c
index 5e8884f4..796e898b 100644
--- a/transmitters/shm/fs-shm-stream-transmitter.c
+++ b/transmitters/shm/fs-shm-stream-transmitter.c
@@ -324,20 +324,14 @@ fs_shm_stream_transmitter_set_property (GObject *object,
                                            GParamSpec *pspec)
 {
   FsShmStreamTransmitter *self = FS_SHM_STREAM_TRANSMITTER (object);
-  gint c;
 
   switch (prop_id) {
     case PROP_SENDING:
       FS_SHM_STREAM_TRANSMITTER_LOCK (self);
       self->priv->sending = g_value_get_boolean (value);
-      for (c = 1; c <= self->priv->transmitter->components; c++)
-      {
-        if (self->priv->shm_sink[c])
-        {
-          fs_shm_transmitter_sink_set_sending (self->priv->transmitter,
-              self->priv->shm_sink[c], self->priv->sending);
-        }
-      }
+      if (self->priv->shm_sink[1])
+        fs_shm_transmitter_sink_set_sending (self->priv->transmitter,
+            self->priv->shm_sink[1], self->priv->sending);
       FS_SHM_STREAM_TRANSMITTER_UNLOCK (self);
       break;
     case PROP_PREFERRED_LOCAL_CANDIDATES:
@@ -422,8 +416,9 @@ fs_shm_stream_transmitter_add_sink (FsShmStreamTransmitter *self,
   if (self->priv->shm_sink[candidate->component_id] == NULL)
     return FALSE;
 
-  fs_shm_transmitter_sink_set_sending (self->priv->transmitter,
-      self->priv->shm_sink[candidate->component_id], self->priv->sending);
+  if (candidate->component_id == 1)
+    fs_shm_transmitter_sink_set_sending (self->priv->transmitter,
+        self->priv->shm_sink[candidate->component_id], self->priv->sending);
 
   return TRUE;
 }
@@ -579,8 +574,9 @@ fs_shm_stream_transmitter_gather_local_candidates (
       if (self->priv->shm_sink[c] == NULL)
         return FALSE;
 
-      fs_shm_transmitter_sink_set_sending (self->priv->transmitter,
-          self->priv->shm_sink[c], self->priv->sending);
+      if (c == 1)
+        fs_shm_transmitter_sink_set_sending (self->priv->transmitter,
+            self->priv->shm_sink[c], self->priv->sending);
     }
 
     return TRUE;
diff --git a/transmitters/shm/fs-shm-transmitter.c b/transmitters/shm/fs-shm-transmitter.c
index 49cfdd9f..917eccff 100644
--- a/transmitters/shm/fs-shm-transmitter.c
+++ b/transmitters/shm/fs-shm-transmitter.c
@@ -809,17 +809,12 @@ fs_shm_transmitter_get_shm_sink (FsShmTransmitter *self,
 
   /* Second add the recvonly filter */
 
-  elem = fs_transmitter_get_recvonly_filter (FS_TRANSMITTER (self), component);
-
+  elem = gst_element_factory_make ("valve", NULL);
   if (!elem)
   {
-    elem = gst_element_factory_make ("valve", NULL);
-    if (!elem)
-    {
-      g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
+    g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION,
         "Could not make valve");
-      goto error;
-    }
+    goto error;
   }
 
   if (!gst_bin_add (GST_BIN (self->priv->gst_sink), elem))
@@ -934,8 +929,6 @@ fs_shm_transmitter_sink_set_sending (FsShmTransmitter *self, ShmSink *shm,
 
   if (g_object_class_find_property (klass, "drop"))
     g_object_set (shm->recvonly_filter, "drop", !sending, NULL);
-  else if (g_object_class_find_property (klass, "sending"))
-    g_object_set (shm->recvonly_filter, "sending", sending, NULL);
 
   if (sending)
     gst_element_send_event (shm->sink,