fix plugin names move gstvideosink.h to videosink.h

Original commit message from CVS:
fix plugin names
move gstvideosink.h to videosink.h

5 files changed, 16 insertions, 80 deletions

diff --git a/ChangeLog b/ChangeLog
index 709184ba..c4ba644a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2004-03-01  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* gst-libs/gst/video/Makefile.am:
+	* gst-libs/gst/video/gstvideosink.c:
+	* gst-libs/gst/video/gstvideosink.h:
+          rename gstvideosink.h to videosink.h to match other headers
+	* gst/mixmatrix/Makefile.am:
+          fix plugin filename
+	* gst/tags/Makefile.am: fix plugin filename
+
+2004-03-01  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* gst/tags/Makefile.am: fix plugin filename
 
 2004-03-01  Thomas Vander Stichele  <thomas at apestaart dot org>
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 48144ae3..7a163773 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -5,7 +5,7 @@ library_LTLIBRARIES = libgstvideo.la
 libgstvideo_la_SOURCES = video.c gstvideosink.c 
 
 libgstvideoincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video
-libgstvideoinclude_HEADERS = video.h gstvideosink.h
+libgstvideoinclude_HEADERS = video.h videosink.h
 
 libgstvideo_la_LIBADD =
 libgstvideo_la_CFLAGS = $(GST_CFLAGS)
diff --git a/gst-libs/gst/video/gstvideosink.c b/gst-libs/gst/video/gstvideosink.c
index ca7cc51a..15f27c16 100644
--- a/gst-libs/gst/video/gstvideosink.c
+++ b/gst-libs/gst/video/gstvideosink.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif
 
-#include "gstvideosink.h"
+#include "videosink.h"
 
 static GstElementClass *parent_class = NULL;
 
diff --git a/gst-libs/gst/video/gstvideosink.h b/gst-libs/gst/video/gstvideosink.h
deleted file mode 100644
index 129a47d6..00000000
--- a/gst-libs/gst/video/gstvideosink.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  GStreamer Video sink.
- *
- *  Copyright (C) <2003> Julien Moutte <julien@moutte.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
- 
-#ifndef __GST_VIDEOSINK_H__
-#define __GST_VIDEOSINK_H__
-
-#include <gst/gst.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-  
-#define GST_TYPE_VIDEOSINK (gst_videosink_get_type())
-#define GST_VIDEOSINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEOSINK, GstVideoSink))
-#define GST_VIDEOSINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_VIDEOSINK, GstVideoSink))
-#define GST_IS_VIDEOSINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEOSINK))
-#define GST_IS_VIDEOSINK_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_VIDEOSINK))
-#define GST_VIDEOSINK_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VIDEOSINK, GstVideoSinkClass))
-  
-#define GST_VIDEOSINK_PAD(obj) (GST_VIDEOSINK (obj)->sinkpad)
-#define GST_VIDEOSINK_WIDTH(obj) (GST_VIDEOSINK (obj)->width)
-#define GST_VIDEOSINK_HEIGHT(obj) (GST_VIDEOSINK (obj)->height)
-#define GST_VIDEOSINK_CLOCK(obj) (GST_VIDEOSINK (obj)->clock)
-  
-typedef struct _GstVideoSink GstVideoSink;
-typedef struct _GstVideoSinkClass GstVideoSinkClass;
-
-struct _GstVideoSink {
-  GstElement element;
-  
-  GstPad *sinkpad;
-  
-  gint width, height;
-  
-  GstClock *clock;
-  
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-struct _GstVideoSinkClass {
-  GstElementClass parent_class;
-      
-  gpointer _gst_reserved[GST_PADDING];
-};
-
-GType gst_videosink_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif  /* __GST_VIDEOSINK_H__ */
diff --git a/gst/mixmatrix/Makefile.am b/gst/mixmatrix/Makefile.am
index 54d5c62a..3997cada 100755
--- a/gst/mixmatrix/Makefile.am
+++ b/gst/mixmatrix/Makefile.am
@@ -1,7 +1,7 @@
 
 plugin_LTLIBRARIES = libgstmixmatrix.la
 
-libmixmatrix_la_SOURCES = mixmatrix.c
-libmixmatrix_la_CFLAGS = $(GST_CFLAGS)
-libmixmatrix_la_LIBADD =
-libmixmatrix_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstmixmatrix_la_SOURCES = mixmatrix.c
+libgstmixmatrix_la_CFLAGS = $(GST_CFLAGS)
+libgstmixmatrix_la_LIBADD =
+libgstmixmatrix_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)