From d4bf6b36d252f085ba02c576258ce2a166bf4d76 Mon Sep 17 00:00:00 2001 From: Doug Nazar Date: Mon, 19 Apr 2021 13:22:16 -0400 Subject: [PATCH] tcp: cleanup files consolidate gsttcp.h & gsttcpelements.h rename gsttcpelement.c to match header Part-of: --- gst/tcp/gstsocketsrc.c | 1 - gst/tcp/gsttcp.h | 32 ------------------- gst/tcp/gsttcpclientsink.c | 1 - gst/tcp/gsttcpclientsink.h | 2 -- gst/tcp/gsttcpclientsrc.c | 1 - gst/tcp/{gsttcpelement.c => gsttcpelements.c} | 0 gst/tcp/gsttcpelements.h | 4 +++ gst/tcp/gsttcpserversink.c | 1 - gst/tcp/gsttcpserversrc.c | 1 - gst/tcp/gsttcpserversrc.h | 2 -- gst/tcp/meson.build | 2 +- 11 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 gst/tcp/gsttcp.h rename gst/tcp/{gsttcpelement.c => gsttcpelements.c} (100%) diff --git a/gst/tcp/gstsocketsrc.c b/gst/tcp/gstsocketsrc.c index 613f985fab..22d77b2aae 100644 --- a/gst/tcp/gstsocketsrc.c +++ b/gst/tcp/gstsocketsrc.c @@ -53,7 +53,6 @@ #include #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 index 774bd27255..0000000000 --- a/gst/tcp/gsttcp.h +++ /dev/null @@ -1,32 +0,0 @@ -/* GStreamer - * Copyright (C) <1999> Erik Walthinsen - * Copyright (C) <2004> Thomas Vander Stichele - * - * 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 - -#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 6b701d2666..a2e4a5228b 100644 --- a/gst/tcp/gsttcpclientsink.c +++ b/gst/tcp/gsttcpclientsink.c @@ -43,7 +43,6 @@ #endif #include -#include "gsttcp.h" #include "gsttcpelements.h" #include "gsttcpclientsink.h" diff --git a/gst/tcp/gsttcpclientsink.h b/gst/tcp/gsttcpclientsink.h index 9e89c73eca..0a554131c1 100644 --- a/gst/tcp/gsttcpclientsink.h +++ b/gst/tcp/gsttcpclientsink.h @@ -27,8 +27,6 @@ #include -#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 980edd4c51..de1441d0e2 100644 --- 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 c6f5edcc5e..df3b6e1ab6 100644 --- a/gst/tcp/gsttcpelements.h +++ b/gst/tcp/gsttcpelements.h @@ -22,6 +22,10 @@ #include +#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 7053fa1df0..23bd70cafd 100644 --- a/gst/tcp/gsttcpserversink.c +++ b/gst/tcp/gsttcpserversink.c @@ -40,7 +40,6 @@ #include #include /* memset */ -#include "gsttcp.h" #include "gsttcpelements.h" #include "gsttcpserversink.h" diff --git a/gst/tcp/gsttcpserversrc.c b/gst/tcp/gsttcpserversrc.c index ead28191ec..a831c9cd8c 100644 --- a/gst/tcp/gsttcpserversrc.c +++ b/gst/tcp/gsttcpserversrc.c @@ -41,7 +41,6 @@ #endif #include -#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 8cf5f732fd..61c1c60d61 100644 --- 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 d6274c2311..86c62b3b95 100644 --- 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',