From 735ba122b8a0ee5bc2a00b6ac7084ebe58ce8ed1 Mon Sep 17 00:00:00 2001 From: Hyunjun Ko Date: Thu, 10 Dec 2015 16:31:25 +0900 Subject: [PATCH] Remove FIXME-WFD temporary code Change-Id: Ib59e88b3a089538239896a2714abc2c8c65aa596 --- gst/rtsp-server/rtsp-client.c | 8 -------- gst/rtsp-server/rtsp-stream.c | 5 ----- 2 files changed, 13 deletions(-) diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c index 05ff274..4f3212d 100644 --- a/gst/rtsp-server/rtsp-client.c +++ b/gst/rtsp-server/rtsp-client.c @@ -1846,8 +1846,6 @@ handle_setup_request (GstRTSPClient * client, GstRTSPContext * ctx) if (media == NULL) goto media_not_found_no_reply; - /* FIXME-WFD : wfd url problem */ -#if 0 if (path[matched] == '\0') { if (gst_rtsp_media_n_streams (media) == 1) { stream = gst_rtsp_media_get_stream (media, 0); @@ -1863,12 +1861,6 @@ handle_setup_request (GstRTSPClient * client, GstRTSPContext * ctx) /* find the stream now using the control part */ stream = gst_rtsp_media_find_stream (media, control); } -#else - control = g_strdup ("stream=0"); - - /* find the stream now using the control part */ - stream = gst_rtsp_media_find_stream (media, control); -#endif if (stream == NULL) goto stream_not_found; diff --git a/gst/rtsp-server/rtsp-stream.c b/gst/rtsp-server/rtsp-stream.c index 9805c1e..a015346 100644 --- a/gst/rtsp-server/rtsp-stream.c +++ b/gst/rtsp-server/rtsp-stream.c @@ -1280,15 +1280,10 @@ alloc_ports (GstRTSPStream * stream) G_SOCKET_FAMILY_IPV4, priv->udpsrc_v4, priv->udpsink, &priv->server_port_v4, &priv->server_addr_v4); - /* FIXME-WFD : force to disable ipv6 mode in WFD mode */ -#if 0 priv->have_ipv6 = alloc_ports_one_family (stream, priv->pool, priv->buffer_size, G_SOCKET_FAMILY_IPV6, priv->udpsrc_v6, priv->udpsink, &priv->server_port_v6, &priv->server_addr_v6); -#else - priv->have_ipv6 = FALSE; -#endif return priv->have_ipv4 || priv->have_ipv6; } -- 2.7.4