[farsight2/master] Apply the auto-multicast property only if it exists

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


---
 transmitters/multicast/fs-multicast-transmitter.c |    8 +++-----
 transmitters/rawudp/fs-rawudp-transmitter.c       |    3 ---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/transmitters/multicast/fs-multicast-transmitter.c b/transmitters/multicast/fs-multicast-transmitter.c
index de0a4a9..22b1428 100644
--- a/transmitters/multicast/fs-multicast-transmitter.c
+++ b/transmitters/multicast/fs-multicast-transmitter.c
@@ -673,7 +673,9 @@ _create_sinksource (gchar *elementname, GstBin *bin,
     "sockfd", fd,
     NULL);
 
-  if (direction == GST_PAD_SINK)
+
+  if (g_object_class_find_property (G_OBJECT_GET_CLASS (elem),
+          "auto-multicast"))
     g_object_set (elem, "auto-multicast", FALSE, NULL);
 
   if (!gst_bin_add (bin, elem)) {
@@ -823,10 +825,6 @@ fs_multicast_transmitter_get_udpsock (FsMulticastTransmitter *trans,
         GST_PAD_SRC, &udpsock->udpsrc_requested_pad, error);
     if (!udpsock->udpsrc)
       goto error;
-
-    g_object_set (udpsock->udpsrc,
-        "auto-multicast", FALSE,
-        NULL);
   }
 
   udpsock->udpsink = _create_sinksource ("multiudpsink",
diff --git a/transmitters/rawudp/fs-rawudp-transmitter.c b/transmitters/rawudp/fs-rawudp-transmitter.c
index edbcaf3..0175d0d 100644
--- a/transmitters/rawudp/fs-rawudp-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-transmitter.c
@@ -765,9 +765,6 @@ fs_rawudp_transmitter_get_udpport (FsRawUdpTransmitter *trans,
   g_object_set (udpport->udpsink,
       "async", FALSE,
       "sync", FALSE,
-      NULL);
-
-  g_object_set (udpport->udpsrc,
       "auto-multicast", FALSE,
       NULL);
 
-- 
1.5.6.5




More information about the farsight-commits mailing list