Commit d4bf6b36 authored by Doug Nazar's avatar Doug Nazar Committed by GStreamer Marge Bot

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>
parent ada8b07b
......@@ -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
......
/* 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__ */
......@@ -43,7 +43,6 @@
#endif
#include <gst/gst-i18n-plugin.h>
#include "gsttcp.h"
#include "gsttcpelements.h"
#include "gsttcpclientsink.h"
......
......@@ -27,8 +27,6 @@
#include <gio/gio.h>
#include "gsttcp.h"
G_BEGIN_DECLS
#define GST_TYPE_TCP_CLIENT_SINK \
......
......@@ -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
......
......@@ -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);
......
......@@ -40,7 +40,6 @@
#include <gst/gst-i18n-plugin.h>
#include <string.h> /* memset */
#include "gsttcp.h"
#include "gsttcpelements.h"
#include "gsttcpserversink.h"
......
......@@ -41,7 +41,6 @@
#endif
#include <gst/gst-i18n-plugin.h>
#include "gsttcp.h"
#include "gsttcpelements.h"
#include "gsttcpsrcstats.h"
#include "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) \
......
......@@ -4,7 +4,7 @@ tcp_sources = [
'gstsocketsrc.c',
'gsttcpclientsrc.c',
'gsttcpclientsink.c',
'gsttcpelement.c',
'gsttcpelements.c',
'gsttcpserversrc.c',
'gsttcpserversink.c',
'gsttcpsrcstats.c',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment