tcp: cleanup files

consolidate gsttcp.h & gsttcpelements.h
rename gsttcpelement.c to match header

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1105>

diff --git a/gst/tcp/gstsocketsrc.c b/gst/tcp/gstsocketsrc.c
index 613f985..22d77b2 100644 (file)
--- a/gst/tcp/gstsocketsrc.c
+++ b/gst/tcp/gstsocketsrc.c
@@ -53,7 +53,6 @@
 #include <gst/net/gstnetcontrolmessagemeta.h>
 #include "gsttcpelements.h"
 #include "gstsocketsrc.h"
-#include "gsttcp.h"
 
 GST_DEBUG_CATEGORY_STATIC (socketsrc_debug);
 #define GST_CAT_DEFAULT socketsrc_debug

diff --git a/gst/tcp/gsttcp.h b/gst/tcp/gsttcp.h
deleted file mode 100644 (file)
index 774bd27..0000000
--- a/gst/tcp/gsttcp.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Copyright (C) <2004> Thomas Vander Stichele <thomas at apestaart dot org>
- *
- * gsttcp.h: helper functions
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GST_TCP_HELP_H__
-#define __GST_TCP_HELP_H__
-
-#include <gst/gst.h>
-
-#define TCP_HIGHEST_PORT        65535
-#define TCP_DEFAULT_HOST        "localhost"
-#define TCP_DEFAULT_PORT        4953
-
-#endif /* __GST_TCP_HELP_H__ */

diff --git a/gst/tcp/gsttcpclientsink.c b/gst/tcp/gsttcpclientsink.c
index 6b701d2..a2e4a52 100644 (file)
--- a/gst/tcp/gsttcpclientsink.c
+++ b/gst/tcp/gsttcpclientsink.c
@@ -43,7 +43,6 @@
 #endif
 #include <gst/gst-i18n-plugin.h>
 
-#include "gsttcp.h"
 #include "gsttcpelements.h"
 #include "gsttcpclientsink.h"
 

diff --git a/gst/tcp/gsttcpclientsink.h b/gst/tcp/gsttcpclientsink.h
index 9e89c73..0a55413 100644 (file)
--- a/gst/tcp/gsttcpclientsink.h
+++ b/gst/tcp/gsttcpclientsink.h
@@ -27,8 +27,6 @@
 
 #include <gio/gio.h>
 
-#include "gsttcp.h"
-
 G_BEGIN_DECLS
 
 #define GST_TYPE_TCP_CLIENT_SINK \

diff --git a/gst/tcp/gsttcpclientsrc.c b/gst/tcp/gsttcpclientsrc.c
index 980edd4..de1441d 100644 (file)
--- a/gst/tcp/gsttcpclientsrc.c
+++ b/gst/tcp/gsttcpclientsrc.c
@@ -47,7 +47,6 @@
 #include "gsttcpelements.h"
 #include "gsttcpclientsrc.h"
 #include "gsttcpsrcstats.h"
-#include "gsttcp.h"
 
 GST_DEBUG_CATEGORY_STATIC (tcpclientsrc_debug);
 #define GST_CAT_DEFAULT tcpclientsrc_debug

diff --git a/gst/tcp/gsttcpelement.c b/gst/tcp/gsttcpelements.c
similarity index 100%
rename from gst/tcp/gsttcpelement.c
rename to gst/tcp/gsttcpelements.c

diff --git a/gst/tcp/gsttcpelements.h b/gst/tcp/gsttcpelements.h
index c6f5edc..df3b6e1 100644 (file)
--- a/gst/tcp/gsttcpelements.h
+++ b/gst/tcp/gsttcpelements.h
@@ -22,6 +22,10 @@
 
 #include <gst/gst.h>
 
+#define TCP_HIGHEST_PORT        65535
+#define TCP_DEFAULT_HOST        "localhost"
+#define TCP_DEFAULT_PORT        4953
+
 G_BEGIN_DECLS
 
 G_GNUC_INTERNAL void tcp_element_init (GstPlugin * plugin);

diff --git a/gst/tcp/gsttcpserversink.c b/gst/tcp/gsttcpserversink.c
index 7053fa1..23bd70c 100644 (file)
--- a/gst/tcp/gsttcpserversink.c
+++ b/gst/tcp/gsttcpserversink.c
@@ -40,7 +40,6 @@
 #include <gst/gst-i18n-plugin.h>
 #include <string.h>             /* memset */
 
-#include "gsttcp.h"
 #include "gsttcpelements.h"
 #include "gsttcpserversink.h"
 

diff --git a/gst/tcp/gsttcpserversrc.c b/gst/tcp/gsttcpserversrc.c
index ead2819..a831c9c 100644 (file)
--- a/gst/tcp/gsttcpserversrc.c
+++ b/gst/tcp/gsttcpserversrc.c
@@ -41,7 +41,6 @@
 #endif
 
 #include <gst/gst-i18n-plugin.h>
-#include "gsttcp.h"
 #include "gsttcpelements.h"
 #include "gsttcpsrcstats.h"
 #include "gsttcpserversrc.h"

diff --git a/gst/tcp/gsttcpserversrc.h b/gst/tcp/gsttcpserversrc.h
index 8cf5f73..61c1c60 100644 (file)
--- a/gst/tcp/gsttcpserversrc.h
+++ b/gst/tcp/gsttcpserversrc.h
@@ -28,8 +28,6 @@
 
 G_END_DECLS
 
-#include "gsttcp.h"
-
 #define GST_TYPE_TCP_SERVER_SRC \
   (gst_tcp_server_src_get_type())
 #define GST_TCP_SERVER_SRC(obj) \

diff --git a/gst/tcp/meson.build b/gst/tcp/meson.build
index d6274c2..86c62b3 100644 (file)
--- a/gst/tcp/meson.build
+++ b/gst/tcp/meson.build
@@ -4,7 +4,7 @@ tcp_sources = [
   'gstsocketsrc.c',
   'gsttcpclientsrc.c',
   'gsttcpclientsink.c',
-  'gsttcpelement.c',
+  'gsttcpelements.c',
   'gsttcpserversrc.c',
   'gsttcpserversink.c',
   'gsttcpsrcstats.c',