remove the videofilter library and link to the one in base

Original commit message from CVS:
remove the videofilter library and link to the one in base

diff --git a/ChangeLog b/ChangeLog
index 55197cc..32a6e56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2005-11-29  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * gst/debug/Makefile.am:
+       * gst/debug/gstnavigationtest.h:
+       * gst/effectv/Makefile.am:
+       * gst/effectv/gstaging.c:
+       * gst/effectv/gstdice.c:
+       * gst/effectv/gstedge.c:
+       * gst/effectv/gstquark.c:
+       * gst/effectv/gstrev.c:
+       * gst/effectv/gstshagadelic.c:
+       * gst/effectv/gstvertigo.c:
+       * gst/effectv/gstwarp.c:
+       * gst/videofilter/Makefile.am:
+       * gst/videofilter/gstvideofilter.c:
+       * gst/videofilter/gstvideofilter.h:
+       * gst/videofilter/gstvideoflip.h:
+         remove the videofilter library and link to the one in base
+
 2005-11-28  Edward Hervey  <edward@fluendo.com>
 
        * gst/avi/gstavidemux.c: (gst_avi_demux_process_next_entry):

diff --git a/gst/debug/Makefile.am b/gst/debug/Makefile.am
index 14bb369..972d2bf 100644 (file)
--- a/gst/debug/Makefile.am
+++ b/gst/debug/Makefile.am
@@ -15,11 +15,9 @@ libgstefence_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 libgstnavigationtest_la_SOURCES = gstnavigationtest.c
 libgstnavigationtest_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
-                                $(GST_PLUGINS_BASE_CFLAGS) \
-                                -I$(top_srcdir)/gst/videofilter
+                                $(GST_PLUGINS_BASE_CFLAGS)
 libgstnavigationtest_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \
-       $(GST_PLUGINS_BASE_LIBS) \
-       $(top_builddir)/gst/videofilter/libgstvideofilter-@GST_MAJORMINOR@.la
+       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@
 libgstnavigationtest_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
  
 libgstdebug_la_SOURCES = \

diff --git a/gst/debug/gstnavigationtest.h b/gst/debug/gstnavigationtest.h
index 98abcd8..b31dacb 100644 (file)
--- a/gst/debug/gstnavigationtest.h
+++ b/gst/debug/gstnavigationtest.h
@@ -21,7 +21,7 @@
 #ifndef __GST_NAVIGATIONTEST_H__
 #define __GST_NAVIGATIONTEST_H__
 
-#include "gstvideofilter.h"
+#include <gst/video/gstvideofilter.h>
 
 G_BEGIN_DECLS
 

diff --git a/gst/effectv/Makefile.am b/gst/effectv/Makefile.am
index 2bdf7b7..4040849 100644 (file)
--- a/gst/effectv/Makefile.am
+++ b/gst/effectv/Makefile.am
@@ -9,10 +9,9 @@ libgsteffectv_la_CFLAGS = \
        $(GST_CFLAGS) \
        -I$(top_srcdir)/gst/videofilter
 libgsteffectv_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) \
+       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
        $(GST_BASE_LIBS) \
-       $(GST_LIBS) \
-       $(top_builddir)/gst/videofilter/libgstvideofilter-@GST_MAJORMINOR@.la
+       $(GST_LIBS)
 libgsteffectv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gsteffectv.h

diff --git a/gst/effectv/gstaging.c b/gst/effectv/gstaging.c
index 3d70fbb..6bddf65 100644 (file)
--- a/gst/effectv/gstaging.c
+++ b/gst/effectv/gstaging.c
@@ -37,7 +37,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <string.h>
 #include <math.h>

diff --git a/gst/effectv/gstdice.c b/gst/effectv/gstdice.c
index 3d2376c..12ce2ed 100644 (file)
--- a/gst/effectv/gstdice.c
+++ b/gst/effectv/gstdice.c
@@ -14,7 +14,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <string.h>
 #include <gst/gst.h>

diff --git a/gst/effectv/gstedge.c b/gst/effectv/gstedge.c
index 2ee53db..8a34480 100644 (file)
--- a/gst/effectv/gstedge.c
+++ b/gst/effectv/gstedge.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <string.h>
 

diff --git a/gst/effectv/gstquark.c b/gst/effectv/gstquark.c
index e8ef93e..161eb80 100644 (file)
--- a/gst/effectv/gstquark.c
+++ b/gst/effectv/gstquark.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <math.h>
 #include <string.h>

diff --git a/gst/effectv/gstrev.c b/gst/effectv/gstrev.c
index 331d6b3..a1482e7 100644 (file)
--- a/gst/effectv/gstrev.c
+++ b/gst/effectv/gstrev.c
@@ -44,7 +44,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <math.h>
 #include <string.h>

diff --git a/gst/effectv/gstshagadelic.c b/gst/effectv/gstshagadelic.c
index cedf9c9..6a39f72 100644 (file)
--- a/gst/effectv/gstshagadelic.c
+++ b/gst/effectv/gstshagadelic.c
@@ -26,7 +26,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <math.h>
 #include <string.h>

diff --git a/gst/effectv/gstvertigo.c b/gst/effectv/gstvertigo.c
index abe92a5..04df431 100644 (file)
--- a/gst/effectv/gstvertigo.c
+++ b/gst/effectv/gstvertigo.c
@@ -26,7 +26,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <math.h>
 #include <string.h>

diff --git a/gst/effectv/gstwarp.c b/gst/effectv/gstwarp.c
index 4cf4b54..190d0d5 100644 (file)
--- a/gst/effectv/gstwarp.c
+++ b/gst/effectv/gstwarp.c
@@ -37,7 +37,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <string.h>
 #include <math.h>

diff --git a/gst/videofilter/Makefile.am b/gst/videofilter/Makefile.am
index 3bfcbce..cb5e286 100644 (file)
--- a/gst/videofilter/Makefile.am
+++ b/gst/videofilter/Makefile.am
@@ -1,16 +1,11 @@
-noinst_LTLIBRARIES = libgstvideofilter-@GST_MAJORMINOR@.la
 # noinst_LTLIBRARIES = libgstvideoexample.la
 plugin_LTLIBRARIES = libgstvideoflip.la
 
-noinst_HEADERS = gstvideofilter.h gstvideoflip.h
+noinst_HEADERS = gstvideoflip.h
 
 EXTRA_DIST = gstvideotemplate.c make_filter
 CLEANFILES = gstvideoexample.c
 
-libgstvideofilter_@GST_MAJORMINOR@_la_SOURCES = gstvideofilter.c gstvideofilter.h
-libgstvideofilter_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
-libgstvideofilter_@GST_MAJORMINOR@_la_LIBS = $(GST_LIBS)
-
 # libgstvideoexample_la_SOURCES = gstvideoexample.c
 # libgstvideoexample_la_CFLAGS = $(GST_CFLAGS)
 # libgstvideoexample_la_LIBADD = libgstvideofilter-@GST_MAJORMINOR@.la $(GST_LIBS)
@@ -19,8 +14,7 @@ libgstvideofilter_@GST_MAJORMINOR@_la_LIBS = $(GST_LIBS)
 libgstvideoflip_la_SOURCES = gstvideoflip.c
 libgstvideoflip_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
                            $(GST_PLUGINS_BASE_CFLAGS)
-libgstvideoflip_la_LIBADD = libgstvideofilter-@GST_MAJORMINOR@.la $(GST_LIBS) \
-                           $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS)
+libgstvideoflip_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS)
 libgstvideoflip_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 # libgstvideobalance_la_SOURCES = gstvideobalance.c

diff --git a/gst/videofilter/gstvideofilter.c b/gst/videofilter/gstvideofilter.c
deleted file mode 100644 (file)
index a7d9db0..0000000
--- a/gst/videofilter/gstvideofilter.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Copyright (C) <2003> David Schleef <ds@schleef.org>
- *
- * 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 "gstvideofilter.h"
-
-GST_DEBUG_CATEGORY_STATIC (gst_videofilter_debug);
-#define GST_CAT_DEFAULT gst_videofilter_debug
-
-static void gst_videofilter_class_init (gpointer g_class, gpointer class_data);
-static void gst_videofilter_init (GTypeInstance * instance, gpointer g_class);
-
-static GstBaseTransformClass *parent_class = NULL;
-
-GType
-gst_videofilter_get_type (void)
-{
-  static GType videofilter_type = 0;
-
-  if (!videofilter_type) {
-    static const GTypeInfo videofilter_info = {
-      sizeof (GstVideofilterClass),
-      NULL,
-      NULL,
-      gst_videofilter_class_init,
-      NULL,
-      NULL,
-      sizeof (GstVideofilter),
-      0,
-      gst_videofilter_init,
-    };
-
-    videofilter_type = g_type_register_static (GST_TYPE_BASE_TRANSFORM,
-        "GstVideofilter", &videofilter_info, G_TYPE_FLAG_ABSTRACT);
-  }
-  return videofilter_type;
-}
-
-static void
-gst_videofilter_class_init (gpointer g_class, gpointer class_data)
-{
-  GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
-  GstBaseTransformClass *trans_class;
-  GstVideofilterClass *klass;
-
-  klass = (GstVideofilterClass *) g_class;
-  gobject_class = (GObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
-  trans_class = (GstBaseTransformClass *) klass;
-
-  parent_class = g_type_class_peek_parent (klass);
-
-  GST_DEBUG_CATEGORY_INIT (gst_videofilter_debug, "videofilter", 0,
-      "videofilter");
-}
-
-static void
-gst_videofilter_init (GTypeInstance * instance, gpointer g_class)
-{
-  GstVideofilter *videofilter = GST_VIDEOFILTER (instance);
-
-  GST_DEBUG_OBJECT (videofilter, "gst_videofilter_init");
-
-  videofilter->inited = FALSE;
-}

diff --git a/gst/videofilter/gstvideofilter.h b/gst/videofilter/gstvideofilter.h
deleted file mode 100644 (file)
index a2f9ef0..0000000
--- a/gst/videofilter/gstvideofilter.h
+++ /dev/null
@@ -1,56 +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_VIDEOFILTER_H__
-#define __GST_VIDEOFILTER_H__
-
-#include <gst/base/gstbasetransform.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GstVideofilter GstVideofilter;
-typedef struct _GstVideofilterClass GstVideofilterClass;
-
-#define GST_TYPE_VIDEOFILTER \
-  (gst_videofilter_get_type())
-#define GST_VIDEOFILTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEOFILTER,GstVideofilter))
-#define GST_VIDEOFILTER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEOFILTER,GstVideofilterClass))
-#define GST_IS_VIDEOFILTER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEOFILTER))
-#define GST_IS_VIDEOFILTER_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEOFILTER))
-
-struct _GstVideofilter {
-  GstBaseTransform element;
-
-  gboolean inited;
-};
-
-struct _GstVideofilterClass {
-  GstBaseTransformClass parent_class;
-};
-
-GType gst_videofilter_get_type(void);
-
-G_END_DECLS
-
-#endif /* __GST_VIDEOFILTER_H__ */

diff --git a/gst/videofilter/gstvideoflip.h b/gst/videofilter/gstvideoflip.h
index aab7a0d..6a83009 100644 (file)
--- a/gst/videofilter/gstvideoflip.h
+++ b/gst/videofilter/gstvideoflip.h
@@ -20,7 +20,7 @@
 #ifndef __GST_VIDEO_FLIP_H__
 #define __GST_VIDEO_FLIP_H__
 
-#include "gstvideofilter.h"
+#include <gst/video/gstvideofilter.h>
 
 G_BEGIN_DECLS