Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
dougnazar authored and GStreamer Marge Bot committed Apr 20, 2021
1 parent ada8b07 commit d4bf6b3
Show file tree
Hide file tree
Showing 11 changed files with 5 additions and 42 deletions.
1 change: 0 additions & 1 deletion gst/tcp/gstsocketsrc.c
Expand Up @@ -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
Expand Down
32 changes: 0 additions & 32 deletions gst/tcp/gsttcp.h

This file was deleted.

1 change: 0 additions & 1 deletion gst/tcp/gsttcpclientsink.c
Expand Up @@ -43,7 +43,6 @@
#endif
#include <gst/gst-i18n-plugin.h>

#include "gsttcp.h"
#include "gsttcpelements.h"
#include "gsttcpclientsink.h"

Expand Down
2 changes: 0 additions & 2 deletions gst/tcp/gsttcpclientsink.h
Expand Up @@ -27,8 +27,6 @@

#include <gio/gio.h>

#include "gsttcp.h"

G_BEGIN_DECLS

#define GST_TYPE_TCP_CLIENT_SINK \
Expand Down
1 change: 0 additions & 1 deletion gst/tcp/gsttcpclientsrc.c
Expand Up @@ -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
Expand Down
File renamed without changes.
4 changes: 4 additions & 0 deletions gst/tcp/gsttcpelements.h
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion gst/tcp/gsttcpserversink.c
Expand Up @@ -40,7 +40,6 @@
#include <gst/gst-i18n-plugin.h>
#include <string.h> /* memset */

#include "gsttcp.h"
#include "gsttcpelements.h"
#include "gsttcpserversink.h"

Expand Down
1 change: 0 additions & 1 deletion gst/tcp/gsttcpserversrc.c
Expand Up @@ -41,7 +41,6 @@
#endif

#include <gst/gst-i18n-plugin.h>
#include "gsttcp.h"
#include "gsttcpelements.h"
#include "gsttcpsrcstats.h"
#include "gsttcpserversrc.h"
Expand Down
2 changes: 0 additions & 2 deletions gst/tcp/gsttcpserversrc.h
Expand Up @@ -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) \
Expand Down
2 changes: 1 addition & 1 deletion gst/tcp/meson.build
Expand Up @@ -4,7 +4,7 @@ tcp_sources = [
'gstsocketsrc.c',
'gsttcpclientsrc.c',
'gsttcpclientsink.c',
'gsttcpelement.c',
'gsttcpelements.c',
'gsttcpserversrc.c',
'gsttcpserversink.c',
'gsttcpsrcstats.c',
Expand Down

0 comments on commit d4bf6b3

Please sign in to comment.