gsttcp -> gsttcpplugin

Original commit message from CVS:
gsttcp -> gsttcpplugin

diff --git a/ChangeLog b/ChangeLog
index 4f99467..c8f10b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-19  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * gst/tcp/Makefile.am:
+       * gst/tcp/gsttcp.c:
+       * gst/tcp/gsttcp.h:
+       * gst/tcp/gsttcpsink.h:
+       * gst/tcp/gsttcpsrc.h:
+          gsttcp -> gsttcpplugin + CVS surgery in preparation for tcp merge
+
 2004-05-19  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
        * gst/debug/tests.c: (md5_get_value):

diff --git a/gst/tcp/Makefile.am b/gst/tcp/Makefile.am
index 3801134..7bf0454 100644 (file)
--- a/gst/tcp/Makefile.am
+++ b/gst/tcp/Makefile.am
@@ -1,11 +1,11 @@
 
 plugin_LTLIBRARIES = libgsttcp.la
 
-libgsttcp_la_SOURCES = gsttcp.c gsttcpsrc.c gsttcpsink.c
+libgsttcp_la_SOURCES = gsttcpplugin.c gsttcpsrc.c gsttcpsink.c
 libgsttcp_la_CFLAGS = $(GST_CFLAGS)
 libgsttcp_la_LIBADD =
 libgsttcp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
-noinst_HEADERS = gsttcpsink.h gsttcpsrc.h gsttcp.h
+noinst_HEADERS = gsttcpsink.h gsttcpsrc.h gsttcpplugin.h
 
 EXTRA_DIST = README

diff --git a/gst/tcp/gsttcp.c b/gst/tcp/gsttcp.c
deleted file mode 100644 (file)
index ace1a34..0000000
--- a/gst/tcp/gsttcp.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *
- * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gsttcpsrc.h"
-#include "gsttcpsink.h"
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  if (!gst_element_register (plugin, "tcpsink", GST_RANK_NONE,
-          GST_TYPE_TCPSINK))
-    return FALSE;
-
-  if (!gst_element_register (plugin, "tcpsrc", GST_RANK_NONE, GST_TYPE_TCPSRC))
-    return FALSE;
-
-  return TRUE;
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "tcp",
-    "transfer data over the network via TCP",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)

diff --git a/gst/tcp/gsttcp.h b/gst/tcp/gsttcp.h
deleted file mode 100644 (file)
index 1a85d7a..0000000
--- a/gst/tcp/gsttcp.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- *
- * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __GST_TCP_H__
-#define __GST_TCP_H__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif                         /* __cplusplus */
-
-  typedef enum
-  {
-    CONTROL_ZERO,
-    CONTROL_NONE,
-    CONTROL_TCP
-  } Gst_TCP_Control;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __GST_TCP_H__ */

diff --git a/gst/tcp/gsttcpsink.h b/gst/tcp/gsttcpsink.h
index 01b8bba..98c82f6 100644 (file)
--- a/gst/tcp/gsttcpsink.h
+++ b/gst/tcp/gsttcpsink.h
@@ -41,7 +41,7 @@ extern "C" {
 #include <sys/wait.h>
 #include <fcntl.h>
 #include <arpa/inet.h>
-#include "gsttcp.h"
+#include "gsttcpplugin.h"
 
 #define GST_TYPE_TCPSINK \
   (gst_tcpsink_get_type())

diff --git a/gst/tcp/gsttcpsrc.h b/gst/tcp/gsttcpsrc.h
index 3506788..8905abd 100644 (file)
--- a/gst/tcp/gsttcpsrc.h
+++ b/gst/tcp/gsttcpsrc.h
@@ -34,7 +34,7 @@ extern "C" {
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include "gsttcp.h"
+#include "gsttcpplugin.h"
 
 #include <fcntl.h>