diff options
author | Wim Taymans <wim.taymans@gmail.com> | 2008-06-13 11:45:54 +0000 |
---|---|---|
committer | Wim Taymans <wim.taymans@gmail.com> | 2008-06-13 11:45:54 +0000 |
commit | ab58eeec2e835bd46020b4a085144a81ba442f5a (patch) | |
tree | e47dfe279546dcd445ecde8ed4ec4ec623ab1b66 | |
parent | 2ba1de92a4c4e8399b2b285daf2f9b15e651a537 (diff) |
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.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | gst/udp/gstmultiudpsink.c | 8 |
2 files changed, 10 insertions, 4 deletions
@@ -1,5 +1,11 @@ 2008-06-13 Wim Taymans <wim.taymans@collabora.co.uk> + * gst/udp/gstmultiudpsink.c: (gst_multiudpsink_init_send), + (gst_multiudpsink_remove): + Fix a typo and do some small cleanups. + +2008-06-13 Wim Taymans <wim.taymans@collabora.co.uk> + Patch by: Olivier Crete <tester at tester dot ca> * gst/rtp/gstrtptheoradepay.c: (gst_rtp_theora_depay_setcaps): diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c index c1c86df4..13b14661 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 */ |