diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | gst-libs/gst/colorbalance/.gitignore | 2 | ||||
| -rw-r--r-- | gst-libs/gst/colorbalance/Makefile.am | 34 | ||||
| -rw-r--r-- | gst-libs/gst/colorbalance/colorbalance.h | 1 | ||||
| -rw-r--r-- | gst-libs/gst/mixer/.gitignore | 2 | ||||
| -rw-r--r-- | gst-libs/gst/mixer/Makefile.am | 36 | ||||
| -rw-r--r-- | gst-libs/gst/mixer/mixer.h | 1 | ||||
| -rw-r--r-- | gst-libs/gst/play/.gitignore | 1 | ||||
| -rw-r--r-- | gst-libs/gst/play/Makefile.am | 32 | ||||
| -rw-r--r-- | gst-libs/gst/play/play.h | 1 | ||||
| -rw-r--r-- | gst-libs/gst/tuner/.gitignore | 2 | ||||
| -rw-r--r-- | gst-libs/gst/tuner/Makefile.am | 39 | ||||
| -rw-r--r-- | gst-libs/gst/tuner/tuner.h | 1 |
13 files changed, 148 insertions, 21 deletions
@@ -1,5 +1,22 @@ 2004-02-03 David I. Lehn <dlehn@users.sourceforge.net> + * gst-libs/gst/colorbalance/Makefile.am: + * gst-libs/gst/colorbalance/colorbalance.h: + * gst-libs/gst/mixer/Makefile.am: + * gst-libs/gst/mixer/mixer.h: + * gst-libs/gst/play/Makefile.am: + * gst-libs/gst/play/play.h: + * gst-libs/gst/tuner/Makefile.am: + * gst-libs/gst/tuner/tuner.h: + Generate enum type code with glib-mkenums. + * gst-libs/gst/colorbalance/.cvsignore: + * gst-libs/gst/mixer/.cvsignore: + * gst-libs/gst/play/.cvsignore: + * gst-libs/gst/tuner/.cvsignore: + Ignore generated files. + +2004-02-03 David I. Lehn <dlehn@users.sourceforge.net> + * gst-libs/gst/audio/.cvsignore: Ignore generated file. * gst-libs/gst/audio/Makefile.am: diff --git a/gst-libs/gst/colorbalance/.gitignore b/gst-libs/gst/colorbalance/.gitignore new file mode 100644 index 00000000..533e6670 --- /dev/null +++ b/gst-libs/gst/colorbalance/.gitignore @@ -0,0 +1,2 @@ +colorbalanceenumtypes.[ch] +colorbalancemarshal.[ch] diff --git a/gst-libs/gst/colorbalance/Makefile.am b/gst-libs/gst/colorbalance/Makefile.am index a86319c2..d2aee92c 100644 --- a/gst-libs/gst/colorbalance/Makefile.am +++ b/gst-libs/gst/colorbalance/Makefile.am @@ -1,23 +1,30 @@ libgstcolorbalanceincludedir = \ $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/colorbalance -libgstcolorbalanceinclude_HEADERS = \ +colorbalance_headers = \ colorbalance.h \ colorbalancechannel.h +built_headers = \ + colorbalancemarshal.h + colorbalanceenumtypes.h + +libgstcolorbalanceinclude_HEADERS = $(colorbalance_headers) $(built_headers) + noinst_LTLIBRARIES = libgstcolorbalance.la libgstcolorbalance_la_SOURCES = \ colorbalance.c \ colorbalancechannel.c \ - colorbalancemarshal.c + colorbalancemarshal.c \ + colorbalanceenumtypes.c libgstcolorbalance_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS) BUILT_SOURCES = \ colorbalancemarshal.c \ - colorbalancemarshal.h -built_headers = \ - colorbalancemarshal.h + colorbalancemarshal.h \ + colorbalanceenumtypes.c \ + colorbalanceenumtypes.h EXTRA_DIST = colorbalancemarshal.list @@ -31,3 +38,20 @@ colorbalancemarshal.c: colorbalancemarshal.list echo "#include \"colorbalancemarshal.h\"" >> colorbalancemarshal.c.tmp glib-genmarshal --body --prefix=gst_color_balance_marshal $^ >> colorbalancemarshal.c.tmp mv colorbalancemarshal.c.tmp colorbalancemarshal.c + +colorbalanceenumtypes.h: $(colorbalance_headers) + glib-mkenums \ + --fhead "#ifndef __GST_COLOR_BALANCE_ENUM_TYPES_H__\n#define __GST_COLOR_BALANCE_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* __GST_COLOR_BALANCE_ENUM_TYPES_H__ */" \ + $^ > $@ + +colorbalanceenumtypes.c: $(colorbalance_headers) + glib-mkenums \ + --fhead "#include <colorbalance.h>" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $^ > $@ diff --git a/gst-libs/gst/colorbalance/colorbalance.h b/gst-libs/gst/colorbalance/colorbalance.h index 3eb126cf..1d3cba6a 100644 --- a/gst-libs/gst/colorbalance/colorbalance.h +++ b/gst-libs/gst/colorbalance/colorbalance.h @@ -24,6 +24,7 @@ #include <gst/gst.h> #include <gst/colorbalance/colorbalancechannel.h> +#include <gst/colorbalance/colorbalanceenumtypes.h> G_BEGIN_DECLS diff --git a/gst-libs/gst/mixer/.gitignore b/gst-libs/gst/mixer/.gitignore new file mode 100644 index 00000000..968ea36b --- /dev/null +++ b/gst-libs/gst/mixer/.gitignore @@ -0,0 +1,2 @@ +mixerenumtypes.[ch] +mixermarshal.[ch] diff --git a/gst-libs/gst/mixer/Makefile.am b/gst-libs/gst/mixer/Makefile.am index ca153dd0..7871a24d 100644 --- a/gst-libs/gst/mixer/Makefile.am +++ b/gst-libs/gst/mixer/Makefile.am @@ -1,23 +1,30 @@ -libgstinterfacesincludedir = \ +libgstmixerincludedir = \ $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/mixer -libgstinterfacesinclude_HEADERS = \ +mixer_headers = \ mixer.h \ mixertrack.h +built_headers = \ + mixermarshal.h \ + mixerenumtypes.h + +libgstmixerinclude_HEADERS = $(mixer_headers) $(built_headers) + noinst_LTLIBRARIES = libgstmixer.la libgstmixer_la_SOURCES = \ mixer.c \ mixertrack.c \ - mixermarshal.c + mixermarshal.c \ + mixerenumtypes.c libgstmixer_la_CFLAGS = $(GST_CFLAGS) BUILT_SOURCES = \ mixermarshal.c \ - mixermarshal.h -built_headers = \ - mixermarshal.h + mixermarshal.h \ + mixerenumtypes.c \ + mixerenumtypes.h EXTRA_DIST = mixermarshal.list @@ -31,3 +38,20 @@ mixermarshal.c: mixermarshal.list echo "#include \"mixermarshal.h\"" >> mixermarshal.c.tmp glib-genmarshal --body --prefix=gst_mixer_marshal $^ >> mixermarshal.c.tmp mv mixermarshal.c.tmp mixermarshal.c + +mixerenumtypes.h: $(mixer_headers) + glib-mkenums \ + --fhead "#ifndef __GST_MIXER_ENUM_TYPES_H__\n#define __GST_MIXER_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* __GST_MIXER_ENUM_TYPES_H__ */" \ + $^ > $@ + +mixerenumtypes.c: $(mixer_headers) + glib-mkenums \ + --fhead "#include <mixer.h>" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $^ > $@ diff --git a/gst-libs/gst/mixer/mixer.h b/gst-libs/gst/mixer/mixer.h index 3af55ab7..bbfe1c75 100644 --- a/gst-libs/gst/mixer/mixer.h +++ b/gst-libs/gst/mixer/mixer.h @@ -24,6 +24,7 @@ #include <gst/gst.h> #include <gst/mixer/mixertrack.h> +#include <gst/mixer/mixerenumtypes.h> G_BEGIN_DECLS diff --git a/gst-libs/gst/play/.gitignore b/gst-libs/gst/play/.gitignore new file mode 100644 index 00000000..fcb0f7c4 --- /dev/null +++ b/gst-libs/gst/play/.gitignore @@ -0,0 +1 @@ +playenumtypes.[ch] diff --git a/gst-libs/gst/play/Makefile.am b/gst-libs/gst/play/Makefile.am index 95ce3d58..58728f1d 100644 --- a/gst-libs/gst/play/Makefile.am +++ b/gst-libs/gst/play/Makefile.am @@ -1,11 +1,17 @@ librarydir = $(libdir) +play_headers = \ + play.h + +built_headers = \ + playenumtypes.h + library_LTLIBRARIES = libgstplay-@GST_MAJORMINOR@.la -libgstplay_@GST_MAJORMINOR@_la_SOURCES = play.c +libgstplay_@GST_MAJORMINOR@_la_SOURCES = play.c playenumtypes.c libgstplay_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/play -libgstplay_@GST_MAJORMINOR@include_HEADERS = play.h +libgstplay_@GST_MAJORMINOR@include_HEADERS = $(play_headers) $(built_headers) libgstplay_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_CFLAGS) libgstplay_@GST_MAJORMINOR@_la_LIBADD = @@ -15,3 +21,25 @@ libgstplay_@GST_MAJORMINOR@_la_LIBADD = libgstplay_@GST_MAJORMINOR@_la_LDFLAGS = \ -version-info @GST_PLUGINS_LIBVERSION@ +BUILT_SOURCES = \ + playenumtypes.c \ + playenumtypes.h + +CLEANFILES = $(BUILT_SOURCES) + +playenumtypes.h: $(play_headers) + glib-mkenums \ + --fhead "#ifndef __GST_PLAY_ENUM_TYPES_H__\n#define __GST_PLAY_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* __GST_PLAY_ENUM_TYPES_H__ */" \ + $^ > $@ + +playenumtypes.c: $(play_headers) + glib-mkenums \ + --fhead "#include <play.h>" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $^ > $@ diff --git a/gst-libs/gst/play/play.h b/gst-libs/gst/play/play.h index 558c96ff..2701036c 100644 --- a/gst-libs/gst/play/play.h +++ b/gst-libs/gst/play/play.h @@ -22,6 +22,7 @@ #include <gst/gst.h> #include <gst/xoverlay/xoverlay.h> +#include <gst/play/playenumtypes.h> /* GError stuff */ diff --git a/gst-libs/gst/tuner/.gitignore b/gst-libs/gst/tuner/.gitignore new file mode 100644 index 00000000..9052893a --- /dev/null +++ b/gst-libs/gst/tuner/.gitignore @@ -0,0 +1,2 @@ +tunerenumtypes.[ch] +tunermarshal.[ch] diff --git a/gst-libs/gst/tuner/Makefile.am b/gst-libs/gst/tuner/Makefile.am index f25ab297..c4020a4b 100644 --- a/gst-libs/gst/tuner/Makefile.am +++ b/gst-libs/gst/tuner/Makefile.am @@ -1,10 +1,16 @@ -libgstinterfacesincludedir = \ +libgsttunerincludedir = \ $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/tuner -libgstinterfacesinclude_HEADERS = \ - tuner.h \ - tunernorm.h \ - tunerchannel.h +tuner_headers = \ + tuner.h \ + tunernorm.h \ + tunerchannel.h + +built_headers = \ + tunermarshal.h + tunerenumtypes.h + +libgsttunerinclude_HEADERS = $(tuner_headers) $(built_headers) noinst_LTLIBRARIES = libgsttuner.la @@ -17,9 +23,9 @@ libgsttuner_la_CFLAGS = $(GST_CFLAGS) BUILT_SOURCES = \ tunermarshal.c \ - tunermarshal.h -built_headers = \ - tunermarshal.h + tunermarshal.h \ + tunerenumtypes.c \ + tunerenumtypes.h EXTRA_DIST = tunermarshal.list @@ -33,3 +39,20 @@ tunermarshal.c: tunermarshal.list echo "#include \"tunermarshal.h\"" >> tunermarshal.c.tmp glib-genmarshal --body --prefix=gst_tuner_marshal $^ >> tunermarshal.c.tmp mv tunermarshal.c.tmp tunermarshal.c + +tunerenumtypes.h: $(tuner_headers) + glib-mkenums \ + --fhead "#ifndef __GST_TUNER_ENUM_TYPES_H__\n#define __GST_TUNER_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* __GST_TUNER_ENUM_TYPES_H__ */" \ + $^ > $@ + +tunerenumtypes.c: $(tuner_headers) + glib-mkenums \ + --fhead "#include <tuner.h>" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $^ > $@ diff --git a/gst-libs/gst/tuner/tuner.h b/gst-libs/gst/tuner/tuner.h index 11a27cc4..c4c45c65 100644 --- a/gst-libs/gst/tuner/tuner.h +++ b/gst-libs/gst/tuner/tuner.h @@ -25,6 +25,7 @@ #include <gst/gst.h> #include <gst/tuner/tunernorm.h> #include <gst/tuner/tunerchannel.h> +#include <gst/tuner/tunerenumtypes.h> G_BEGIN_DECLS |