mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-10 11:29:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

multiudpsink: remove unused field

Browse source
This commit is contained in:
Wim Taymans 2012-10-10 10:18:52 +02:00
parent f4e1bb02b7
commit 2955f0e10c
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst/udp/gstmultiudpsink.c
View file

@ -81,7 +81,6 @@ enum
#define DEFAULT_CLOSE_SOCKET TRUE #define DEFAULT_CLOSE_SOCKET TRUE
#define DEFAULT_USED_SOCKET NULL #define DEFAULT_USED_SOCKET NULL
#define DEFAULT_CLIENTS NULL #define DEFAULT_CLIENTS NULL
#define DEFAULT_FAMILY G_SOCKET_FAMILY_IPV6
/* FIXME, this should be disabled by default, we don't need to join a multicast /* FIXME, this should be disabled by default, we don't need to join a multicast
* group for sending, if this socket is also used for receiving, it should * group for sending, if this socket is also used for receiving, it should
* be configured in the element that does the receive. */ * be configured in the element that does the receive. */
@ -347,7 +346,6 @@ gst_multiudpsink_init (GstMultiUDPSink * sink)
sink->ttl_mc = DEFAULT_TTL_MC; sink->ttl_mc = DEFAULT_TTL_MC;
sink->loop = DEFAULT_LOOP; sink->loop = DEFAULT_LOOP;
sink->qos_dscp = DEFAULT_QOS_DSCP; sink->qos_dscp = DEFAULT_QOS_DSCP;
sink->family = DEFAULT_FAMILY;
sink->send_duplicates = DEFAULT_SEND_DUPLICATES; sink->send_duplicates = DEFAULT_SEND_DUPLICATES;
sink->cancellable = g_cancellable_new (); sink->cancellable = g_cancellable_new ();
@ -820,11 +818,9 @@ gst_multiudpsink_start (GstBaseSink * bsink)
if (sink->socket == NULL) { if (sink->socket == NULL) {
GST_DEBUG_OBJECT (sink, "creating sockets"); GST_DEBUG_OBJECT (sink, "creating sockets");
/* create sender socket try IP6, fall back to IP4 */ /* create sender socket try IP6, fall back to IP4 */
sink->family = G_SOCKET_FAMILY_IPV6;
if ((sink->used_socket = if ((sink->used_socket =
g_socket_new (G_SOCKET_FAMILY_IPV6, g_socket_new (G_SOCKET_FAMILY_IPV6,
G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) { G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) {
sink->family = G_SOCKET_FAMILY_IPV4;
if ((sink->used_socket = g_socket_new (G_SOCKET_FAMILY_IPV4, if ((sink->used_socket = g_socket_new (G_SOCKET_FAMILY_IPV4,
G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL) G_SOCKET_TYPE_DATAGRAM, G_SOCKET_PROTOCOL_UDP, &err)) == NULL)
goto no_socket; goto no_socket;
@ -836,7 +832,6 @@ gst_multiudpsink_start (GstBaseSink * bsink)
GST_DEBUG_OBJECT (sink, "using configured socket"); GST_DEBUG_OBJECT (sink, "using configured socket");
/* we use the configured socket */ /* we use the configured socket */
sink->used_socket = G_SOCKET (g_object_ref (sink->socket)); sink->used_socket = G_SOCKET (g_object_ref (sink->socket));
sink->family = g_socket_get_family (sink->used_socket);
sink->external_socket = TRUE; sink->external_socket = TRUE;
} }

1
gst/udp/gstmultiudpsink.h
View file

@ -76,7 +76,6 @@ struct _GstMultiUDPSink {
gint ttl_mc; gint ttl_mc;
gboolean loop; gboolean loop;
gint qos_dscp; gint qos_dscp;
GSocketFamily family;
gboolean send_duplicates; gboolean send_duplicates;
gint buffer_size; gint buffer_size;