From 08797649fbe07e1bc7a450f3190633a20f3efc84 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Wed, 7 Jan 2004 08:56:45 +0000 Subject: [PATCH] Merge gstvideotemplate.h into gstvideotemplate.c Original commit message from CVS: Merge gstvideotemplate.h into gstvideotemplate.c --- gst/videofilter/Makefile.am | 7 ++--- gst/videofilter/gstvideotemplate.c | 28 ++++++++++++++++-- gst/videofilter/gstvideotemplate.h | 60 -------------------------------------- gst/videofilter/make_filter | 19 +++--------- 4 files changed, 33 insertions(+), 81 deletions(-) delete mode 100644 gst/videofilter/gstvideotemplate.h diff --git a/gst/videofilter/Makefile.am b/gst/videofilter/Makefile.am index 73fb917..5fed471 100644 --- a/gst/videofilter/Makefile.am +++ b/gst/videofilter/Makefile.am @@ -5,8 +5,8 @@ noinst_LTLIBRARIES = libgstvideoexample.la noinst_HEADERS = gstvideofilter.h gstvideoexample.h gstvideoflip.h gstvideobalance.h -EXTRA_DIST = gstvideotemplate.c gstvideotemplate.h make_filter -EXTRA_CLEAN = gstvideoexample.c gstvideoexample.h +EXTRA_DIST = gstvideotemplate.c make_filter +EXTRA_CLEAN = gstvideoexample.c libgstvideofilter_la_SOURCES = gstvideofilter.c libgstvideofilter_la_CFLAGS = $(GST_CFLAGS) @@ -30,7 +30,6 @@ libgstvideobalance_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lm # no, this doesn't work if $(srcdir) != (builddir) -gstvideoexample.c gstvideoexample.h: $(srcdir)/make_filter \ - $(srcdir)/gstvideotemplate.c $(srcdir)/gstvideotemplate.h +gstvideoexample.c: $(srcdir)/make_filter $(srcdir)/gstvideotemplate.c $(srcdir)/make_filter Videoexample diff --git a/gst/videofilter/gstvideotemplate.c b/gst/videofilter/gstvideotemplate.c index 67c72ac..f633a5f 100644 --- a/gst/videofilter/gstvideotemplate.c +++ b/gst/videofilter/gstvideotemplate.c @@ -27,10 +27,34 @@ #include "config.h" #endif -/*#define DEBUG_ENABLED */ -#include +#include +#include #include +#define GST_TYPE_VIDEOTEMPLATE \ + (gst_videotemplate_get_type()) +#define GST_VIDEOTEMPLATE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEOTEMPLATE,GstVideotemplate)) +#define GST_VIDEOTEMPLATE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEOTEMPLATE,GstVideotemplateClass)) +#define GST_IS_VIDEOTEMPLATE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEOTEMPLATE)) +#define GST_IS_VIDEOTEMPLATE_CLASS(obj) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEOTEMPLATE)) + +typedef struct _GstVideotemplate GstVideotemplate; +typedef struct _GstVideotemplateClass GstVideotemplateClass; + +struct _GstVideotemplate { + GstVideofilter videofilter; + +}; + +struct _GstVideotemplateClass { + GstVideofilterClass parent_class; +}; + + /* GstVideotemplate signals and args */ enum { /* FILL ME */ diff --git a/gst/videofilter/gstvideotemplate.h b/gst/videofilter/gstvideotemplate.h deleted file mode 100644 index 1a2c0a2..0000000 --- a/gst/videofilter/gstvideotemplate.h +++ /dev/null @@ -1,60 +0,0 @@ -/* GStreamer - * Copyright (C) <1999> Erik Walthinsen - * - * 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_VIDEOTEMPLATE_H__ -#define __GST_VIDEOTEMPLATE_H__ - - -#include - -#include "gstvideofilter.h" - - -G_BEGIN_DECLS - -#define GST_TYPE_VIDEOTEMPLATE \ - (gst_videotemplate_get_type()) -#define GST_VIDEOTEMPLATE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEOTEMPLATE,GstVideotemplate)) -#define GST_VIDEOTEMPLATE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEOTEMPLATE,GstVideotemplateClass)) -#define GST_IS_VIDEOTEMPLATE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEOTEMPLATE)) -#define GST_IS_VIDEOTEMPLATE_CLASS(obj) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEOTEMPLATE)) - -typedef struct _GstVideotemplate GstVideotemplate; -typedef struct _GstVideotemplateClass GstVideotemplateClass; - -struct _GstVideotemplate { - GstVideofilter videofilter; - -}; - -struct _GstVideotemplateClass { - GstVideofilterClass parent_class; -}; - -GType gst_videotemplate_get_type(void); - -G_END_DECLS - -#endif /* __GST_VIDEOTEMPLATE_H__ */ - diff --git a/gst/videofilter/make_filter b/gst/videofilter/make_filter index 50741e7..2cc66ff 100755 --- a/gst/videofilter/make_filter +++ b/gst/videofilter/make_filter @@ -16,25 +16,14 @@ open IN, "gstvideotemplate.c"; open OUT, ">gst$template.c"; @lines = ; -map { s/Videotemplate/$Template/g; +map { + s/gstvideotemplate\.c/SOURCEFILE/g; + s/Videotemplate/$Template/g; s/videotemplate/$template/g; s/VIDEOTEMPLATE/$TEMPLATE/g; # remember to break up the Id: in the line below s/\$I[d]: (.*)\$/$1/g; -} @lines; - -print OUT @lines; - -close IN; -close OUT; - -open IN, "gstvideotemplate.h"; -open OUT, ">gst$template.h"; - -@lines = ; -map { s/Videotemplate/$Template/g; - s/videotemplate/$template/g; - s/VIDEOTEMPLATE/$TEMPLATE/g; + s/SOURCEFILE/gstvideotemplate\.c/g; } @lines; print OUT @lines; -- 2.7.4