From 85d04e9335bf749bdf5ebe393dcff3ce7fed327e Mon Sep 17 00:00:00 2001
From: Seungha Yang <seungha.yang@navercorp.com>
Date: Fri, 20 Jul 2018 14:05:32 +0900
Subject: srt: Reduce useless call depth

Providing simplified _client_connect() is not required for now.

https://bugzilla.gnome.org/show_bug.cgi?id=796842
---
 ext/srt/gstsrt.c           | 13 +------------
 ext/srt/gstsrt.h           |  6 ------
 ext/srt/gstsrtclientsink.c |  2 +-
 ext/srt/gstsrtclientsrc.c  |  2 +-
 4 files changed, 3 insertions(+), 20 deletions(-)

(limited to 'ext')

diff --git a/ext/srt/gstsrt.c b/ext/srt/gstsrt.c
index 39ccfdf15..bdf21b99f 100644
--- a/ext/srt/gstsrt.c
+++ b/ext/srt/gstsrt.c
@@ -33,7 +33,7 @@
 GST_DEBUG_CATEGORY (GST_CAT_DEFAULT);
 
 SRTSOCKET
-gst_srt_client_connect_full (GstElement * elem, int sender,
+gst_srt_client_connect (GstElement * elem, int sender,
     const gchar * host, guint16 port, int rendez_vous,
     const gchar * bind_address, guint16 bind_port, int latency,
     GSocketAddress ** socket_address, gint * poll_id, gchar * passphrase,
@@ -165,17 +165,6 @@ failed:
   return SRT_INVALID_SOCK;
 }
 
-SRTSOCKET
-gst_srt_client_connect (GstElement * elem, int sender,
-    const gchar * host, guint16 port, int rendez_vous,
-    const gchar * bind_address, guint16 bind_port, int latency,
-    GSocketAddress ** socket_address, gint * poll_id)
-{
-  return gst_srt_client_connect_full (elem, sender, host, port,
-      rendez_vous, bind_address, bind_port, latency, socket_address, poll_id,
-      NULL, 0);
-}
-
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
diff --git a/ext/srt/gstsrt.h b/ext/srt/gstsrt.h
index 6fe5680bc..8d58a71fc 100644
--- a/ext/srt/gstsrt.h
+++ b/ext/srt/gstsrt.h
@@ -38,12 +38,6 @@ G_BEGIN_DECLS
 
 SRTSOCKET
 gst_srt_client_connect (GstElement * elem, int sender,
-    const gchar * host, guint16 port, int rendez_vous,
-    const gchar * bind_address, guint16 bind_port, int latency,
-    GSocketAddress ** socket_address, gint * poll_id);
-
-SRTSOCKET
-gst_srt_client_connect_full (GstElement * elem, int sender,
     const gchar * host, guint16 port, int rendez_vous,
     const gchar * bind_address, guint16 bind_port, int latency,
     GSocketAddress ** socket_address, gint * poll_id,
diff --git a/ext/srt/gstsrtclientsink.c b/ext/srt/gstsrtclientsink.c
index 92e10878a..471171e8a 100644
--- a/ext/srt/gstsrtclientsink.c
+++ b/ext/srt/gstsrtclientsink.c
@@ -159,7 +159,7 @@ gst_srt_client_sink_start (GstBaseSink * sink)
   GstSRTBaseSink *base = GST_SRT_BASE_SINK (sink);
   GstUri *uri = gst_uri_ref (GST_SRT_BASE_SINK (self)->uri);
 
-  priv->sock = gst_srt_client_connect_full (GST_ELEMENT (sink), FALSE,
+  priv->sock = gst_srt_client_connect (GST_ELEMENT (sink), FALSE,
       gst_uri_get_host (uri), gst_uri_get_port (uri), priv->rendez_vous,
       priv->bind_address, priv->bind_port, base->latency,
       &priv->sockaddr, &priv->poll_id, base->passphrase, base->key_length);
diff --git a/ext/srt/gstsrtclientsrc.c b/ext/srt/gstsrtclientsrc.c
index e54dda67a..e1e627ff0 100644
--- a/ext/srt/gstsrtclientsrc.c
+++ b/ext/srt/gstsrtclientsrc.c
@@ -238,7 +238,7 @@ gst_srt_client_src_start (GstBaseSrc * src)
   GstUri *uri = gst_uri_ref (base->uri);
   GSocketAddress *socket_address = NULL;
 
-  priv->sock = gst_srt_client_connect_full (GST_ELEMENT (src), FALSE,
+  priv->sock = gst_srt_client_connect (GST_ELEMENT (src), FALSE,
       gst_uri_get_host (uri), gst_uri_get_port (uri), priv->rendez_vous,
       priv->bind_address, priv->bind_port, base->latency,
       &socket_address, &priv->poll_id, base->passphrase, base->key_length);
-- 
cgit v1.2.3