From ab58eeec2e835bd46020b4a085144a81ba442f5a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 13 Jun 2008 11:45:54 +0000 Subject: [PATCH] gst/udp/gstmultiudpsink.c: Fix a typo and do some small cleanups. Original commit message from CVS: * gst/udp/gstmultiudpsink.c: (gst_multiudpsink_init_send), (gst_multiudpsink_remove): Fix a typo and do some small cleanups. --- ChangeLog | 6 ++++++ gst/udp/gstmultiudpsink.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95d9aa8..8046a94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2008-06-13 Wim Taymans + * gst/udp/gstmultiudpsink.c: (gst_multiudpsink_init_send), + (gst_multiudpsink_remove): + Fix a typo and do some small cleanups. + +2008-06-13 Wim Taymans + Patch by: Olivier Crete * gst/rtp/gstrtptheoradepay.c: (gst_rtp_theora_depay_setcaps): diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c index c1c86df..13b1466 100644 --- a/gst/udp/gstmultiudpsink.c +++ b/gst/udp/gstmultiudpsink.c @@ -625,10 +625,10 @@ gst_multiudpsink_init_send (GstMultiUDPSink * sink) gst_udp_set_loop_ttl (sink->sock, sink->loop, sink->ttl); gst_multiudpsink_setup_qos_dscp (sink); - /* look for multicast clients and join multicast groups approptiately */ + /* look for multicast clients and join multicast groups appropriately */ for (clients = sink->clients; clients; clients = g_list_next (clients)) { client = (GstUDPClient *) clients->data; - if (gst_udp_is_multicast (&client->theiraddr) && sink->auto_multicast) + if (sink->auto_multicast && gst_udp_is_multicast (&client->theiraddr)) gst_udp_join_group (*(client->sock), &client->theiraddr); } return TRUE; @@ -755,8 +755,8 @@ gst_multiudpsink_remove (GstMultiUDPSink * sink, const gchar * host, gint port) g_get_current_time (&now); client->disconnect_time = GST_TIMEVAL_TO_TIME (now); - if (*(client->sock) != -1 && gst_udp_is_multicast (&client->theiraddr) - && sink->auto_multicast) + if (*(client->sock) != -1 && sink->auto_multicast + && gst_udp_is_multicast (&client->theiraddr)) gst_udp_leave_group (*(client->sock), &client->theiraddr); /* Unlock to emit signal before we delete the actual client */ -- 2.7.4