From 3f9d4cbd088a29ec2175c40ec8f7f3ae6a1df509 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 7 Nov 2003 12:47:02 +0000 Subject: [PATCH] Remove all config.h includes from header files, add it to each source file and remove duplicate config.h includes fro... Original commit message from CVS: Remove all config.h includes from header files, add it to each source file and remove duplicate config.h includes from several source files --- ext/cdparanoia/gstcdparanoia.h | 1 - ext/pango/gsttimeoverlay.c | 3 +++ ext/pango/gsttimeoverlay.h | 1 - ext/vorbis/vorbis.c | 3 +++ ext/vorbis/vorbisenc.h | 1 - gst-libs/ext/mplex/buffer.cc | 4 ++++ gst-libs/ext/mplex/padstrm.cc | 4 ++++ gst-libs/ext/mplex/stillsstream.cc | 4 ++++ gst-libs/gst/audio/audioclock.c | 4 ++++ gst-libs/gst/floatcast/floatcast.h | 2 -- gst-libs/gst/gconf/gconf.c | 4 ++++ gst-libs/gst/idct/dct.h | 2 -- gst-libs/gst/idct/fastintidct.c | 4 ++++ gst-libs/gst/idct/floatidct.c | 4 ++++ gst-libs/gst/idct/ieeetest.c | 4 ++++ gst-libs/gst/idct/intidct.c | 4 ++++ gst-libs/gst/idct/mmx32idct.c | 6 +++++- gst-libs/gst/media-info/media-info-priv.c | 4 ++++ gst-libs/gst/media-info/media-info.c | 4 ++++ gst-libs/gst/play/play.old.c | 4 ++++ gst-libs/gst/resample/dtof.c | 3 +++ gst-libs/gst/resample/functable.c | 3 +++ gst-libs/gst/resample/private.h | 1 - gst-libs/gst/resample/resample.c | 3 +++ gst-libs/gst/riff/riffencode.c | 4 ++++ gst-libs/gst/riff/riffparse.c | 4 ++++ gst-libs/gst/riff/riffutil.c | 3 +++ gst-libs/gst/video/gstvideofilter.c | 3 +++ gst-libs/gst/video/gstvideofilter.h | 1 - gst/audioscale/gstaudioscale.h | 1 - gst/sine/gstsinesrc.h | 1 - gst/tcp/gsttcp.c | 3 +++ gst/tcp/gsttcpplugin.c | 3 +++ gst/tcp/gsttcpsink.h | 1 - gst/tcp/gsttcpsrc.h | 1 - gst/videoscale/gstvideoscale.h | 1 - gst/videoscale/videoscale.c | 2 +- gst/videoscale/videoscale_x86.c | 4 ++++ gst/videotestsrc/gstvideotestsrc.h | 1 - gst/videotestsrc/videotestsrc.c | 4 ++++ gst/volume/gstvolume.h | 1 - sys/v4l/gstv4l.c | 15 ++++++++------- sys/v4l/gstv4lmjpegsink.c | 3 --- sys/v4l/gstv4lmjpegsrc.c | 3 --- sys/v4l/gstv4lsrc.c | 3 --- tests/old/testsuite/alsa/sinesrc.h | 1 - testsuite/alsa/sinesrc.h | 1 - 47 files changed, 105 insertions(+), 36 deletions(-) diff --git a/ext/cdparanoia/gstcdparanoia.h b/ext/cdparanoia/gstcdparanoia.h index ad3b3430e9..7b05b3bb09 100644 --- a/ext/cdparanoia/gstcdparanoia.h +++ b/ext/cdparanoia/gstcdparanoia.h @@ -22,7 +22,6 @@ #define __CDPARANOIA_H__ -#include #include #include diff --git a/ext/pango/gsttimeoverlay.c b/ext/pango/gsttimeoverlay.c index dba7561242..6e1b7484d1 100644 --- a/ext/pango/gsttimeoverlay.c +++ b/ext/pango/gsttimeoverlay.c @@ -27,6 +27,9 @@ * Copyright (C) 2001 Sun Microsystems */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /*#define DEBUG_ENABLED */ #include diff --git a/ext/pango/gsttimeoverlay.h b/ext/pango/gsttimeoverlay.h index bc33715368..505f8f049d 100644 --- a/ext/pango/gsttimeoverlay.h +++ b/ext/pango/gsttimeoverlay.h @@ -22,7 +22,6 @@ #define __GST_TIMEOVERLAY_H__ -#include #include #include diff --git a/ext/vorbis/vorbis.c b/ext/vorbis/vorbis.c index 238c2a2a97..493c03e7a3 100644 --- a/ext/vorbis/vorbis.c +++ b/ext/vorbis/vorbis.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include diff --git a/ext/vorbis/vorbisenc.h b/ext/vorbis/vorbisenc.h index 7c004c5b87..c0eb35c9ec 100644 --- a/ext/vorbis/vorbisenc.h +++ b/ext/vorbis/vorbisenc.h @@ -22,7 +22,6 @@ #define __VORBISENC_H__ -#include #include #include diff --git a/gst-libs/ext/mplex/buffer.cc b/gst-libs/ext/mplex/buffer.cc index 2b29180252..24f5fd246e 100644 --- a/gst-libs/ext/mplex/buffer.cc +++ b/gst-libs/ext/mplex/buffer.cc @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "buffer.hh" #include diff --git a/gst-libs/ext/mplex/padstrm.cc b/gst-libs/ext/mplex/padstrm.cc index 95e32dbac3..b60c664398 100644 --- a/gst-libs/ext/mplex/padstrm.cc +++ b/gst-libs/ext/mplex/padstrm.cc @@ -20,6 +20,10 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "padstrm.hh" diff --git a/gst-libs/ext/mplex/stillsstream.cc b/gst-libs/ext/mplex/stillsstream.cc index 1b6d10b382..6f9806f07c 100644 --- a/gst-libs/ext/mplex/stillsstream.cc +++ b/gst-libs/ext/mplex/stillsstream.cc @@ -21,6 +21,10 @@ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include "stillsstream.hh" diff --git a/gst-libs/gst/audio/audioclock.c b/gst-libs/gst/audio/audioclock.c index 342009ff3c..feb06d507c 100644 --- a/gst-libs/gst/audio/audioclock.c +++ b/gst-libs/gst/audio/audioclock.c @@ -20,6 +20,10 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "audioclock.h" static void gst_audio_clock_class_init (GstAudioClockClass *klass); diff --git a/gst-libs/gst/floatcast/floatcast.h b/gst-libs/gst/floatcast/floatcast.h index 3a232b76a3..0d5809f19a 100644 --- a/gst-libs/gst/floatcast/floatcast.h +++ b/gst-libs/gst/floatcast/floatcast.h @@ -21,8 +21,6 @@ #ifndef __FLOATCAST_H__ #define __FLOATCAST_H__ -#include - #if (HAVE_LRINT && HAVE_LRINTF) /* These defines enable functionality introduced with the 1999 ISO C diff --git a/gst-libs/gst/gconf/gconf.c b/gst-libs/gst/gconf/gconf.c index 8a1c5823f1..541a086b49 100644 --- a/gst-libs/gst/gconf/gconf.c +++ b/gst-libs/gst/gconf/gconf.c @@ -21,6 +21,10 @@ * this library handles interaction with GConf */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "gconf.h" #define GST_GCONF_DIR "/system/gstreamer" diff --git a/gst-libs/gst/idct/dct.h b/gst-libs/gst/idct/dct.h index fcb7de37df..efb3ddb36d 100644 --- a/gst-libs/gst/idct/dct.h +++ b/gst-libs/gst/idct/dct.h @@ -1,7 +1,5 @@ /* define DCT types */ -#include "config.h" - /* * DCTSIZE underlying (1d) transform size * DCTSIZE2 DCTSIZE squared diff --git a/gst-libs/gst/idct/fastintidct.c b/gst-libs/gst/idct/fastintidct.c index 3c9e9bb9ff..2742667212 100644 --- a/gst-libs/gst/idct/fastintidct.c +++ b/gst-libs/gst/idct/fastintidct.c @@ -38,6 +38,10 @@ /* compliance sE, 2.1.94 */ /**********************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* this code assumes >> to be a two's-complement arithmetic */ /* right shift: (-2)>>1 == -1 , (-3)>>1 == -2 */ diff --git a/gst-libs/gst/idct/floatidct.c b/gst-libs/gst/idct/floatidct.c index 520c391335..b215bd7843 100644 --- a/gst-libs/gst/idct/floatidct.c +++ b/gst-libs/gst/idct/floatidct.c @@ -35,6 +35,10 @@ /* Here we use math.h to generate constants. Compiler results may vary a little */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #ifndef PI diff --git a/gst-libs/gst/idct/ieeetest.c b/gst-libs/gst/idct/ieeetest.c index c3c66215cc..f5b270ebb8 100644 --- a/gst-libs/gst/idct/ieeetest.c +++ b/gst-libs/gst/idct/ieeetest.c @@ -9,6 +9,10 @@ * Released to public domain 11/22/93. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/gst-libs/gst/idct/intidct.c b/gst-libs/gst/idct/intidct.c index 119b7fd14b..e08e6adbe8 100644 --- a/gst-libs/gst/idct/intidct.c +++ b/gst-libs/gst/idct/intidct.c @@ -18,6 +18,10 @@ * scaled fixed-point arithmetic, with a minimal number of shifts. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "dct.h" /* We assume that right shift corresponds to signed division by 2 with diff --git a/gst-libs/gst/idct/mmx32idct.c b/gst-libs/gst/idct/mmx32idct.c index 0090d8a723..3b640976ef 100644 --- a/gst-libs/gst/idct/mmx32idct.c +++ b/gst-libs/gst/idct/mmx32idct.c @@ -114,7 +114,11 @@ /* mword typedef qword qword ptr equ mword ptr */ - + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #define BITS_INV_ACC 4 /*; 4 or 5 for IEEE */ diff --git a/gst-libs/gst/media-info/media-info-priv.c b/gst-libs/gst/media-info/media-info-priv.c index b92371374b..77981598d7 100644 --- a/gst-libs/gst/media-info/media-info-priv.c +++ b/gst-libs/gst/media-info/media-info-priv.c @@ -19,6 +19,10 @@ /* media-info-priv.c - handling of internal stuff */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "media-info.h" diff --git a/gst-libs/gst/media-info/media-info.c b/gst-libs/gst/media-info/media-info.c index b559463d60..92957e16a6 100644 --- a/gst-libs/gst/media-info/media-info.c +++ b/gst-libs/gst/media-info/media-info.c @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include "media-info.h" diff --git a/gst-libs/gst/play/play.old.c b/gst-libs/gst/play/play.old.c index 486262e56a..64963661a8 100644 --- a/gst-libs/gst/play/play.old.c +++ b/gst-libs/gst/play/play.old.c @@ -22,6 +22,10 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "play.h" enum diff --git a/gst-libs/gst/resample/dtof.c b/gst-libs/gst/resample/dtof.c index c392e676a7..7650453a28 100644 --- a/gst-libs/gst/resample/dtof.c +++ b/gst-libs/gst/resample/dtof.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include diff --git a/gst-libs/gst/resample/functable.c b/gst-libs/gst/resample/functable.c index 94dbec15d4..75b81f366c 100644 --- a/gst-libs/gst/resample/functable.c +++ b/gst-libs/gst/resample/functable.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include diff --git a/gst-libs/gst/resample/private.h b/gst-libs/gst/resample/private.h index fb8ba87f3c..476e611e1a 100644 --- a/gst-libs/gst/resample/private.h +++ b/gst-libs/gst/resample/private.h @@ -22,7 +22,6 @@ #define __PRIVATE_H__ #include "resample.h" -#include "config.h" void resample_nearest_s16(resample_t *r); void resample_bilinear_s16(resample_t *r); diff --git a/gst-libs/gst/resample/resample.c b/gst-libs/gst/resample/resample.c index b298e86dcd..52a80e61ae 100644 --- a/gst-libs/gst/resample/resample.c +++ b/gst-libs/gst/resample/resample.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include diff --git a/gst-libs/gst/riff/riffencode.c b/gst-libs/gst/riff/riffencode.c index a22b1849d9..630725d562 100644 --- a/gst-libs/gst/riff/riffencode.c +++ b/gst-libs/gst/riff/riffencode.c @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include /*#define DEBUG_ENABLED */ diff --git a/gst-libs/gst/riff/riffparse.c b/gst-libs/gst/riff/riffparse.c index 72a7820b8e..72c9e4bb9c 100644 --- a/gst-libs/gst/riff/riffparse.c +++ b/gst-libs/gst/riff/riffparse.c @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include /*#define DEBUG_ENABLED */ diff --git a/gst-libs/gst/riff/riffutil.c b/gst-libs/gst/riff/riffutil.c index 612bdbaf5b..d33aefe34f 100644 --- a/gst-libs/gst/riff/riffutil.c +++ b/gst-libs/gst/riff/riffutil.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include diff --git a/gst-libs/gst/video/gstvideofilter.c b/gst-libs/gst/video/gstvideofilter.c index a7446887a9..3eb92f9a24 100644 --- a/gst-libs/gst/video/gstvideofilter.c +++ b/gst-libs/gst/video/gstvideofilter.c @@ -18,6 +18,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /*#define DEBUG_ENABLED */ #include diff --git a/gst-libs/gst/video/gstvideofilter.h b/gst-libs/gst/video/gstvideofilter.h index 786783506e..fa70832848 100644 --- a/gst-libs/gst/video/gstvideofilter.h +++ b/gst-libs/gst/video/gstvideofilter.h @@ -22,7 +22,6 @@ #define __GST_VIDEOFILTER_H__ -#include #include diff --git a/gst/audioscale/gstaudioscale.h b/gst/audioscale/gstaudioscale.h index ed930daac0..90cfd1d137 100644 --- a/gst/audioscale/gstaudioscale.h +++ b/gst/audioscale/gstaudioscale.h @@ -22,7 +22,6 @@ #define __AUDIOSCALE_H__ -#include #include #include diff --git a/gst/sine/gstsinesrc.h b/gst/sine/gstsinesrc.h index 8f811fccd1..c5c970f369 100644 --- a/gst/sine/gstsinesrc.h +++ b/gst/sine/gstsinesrc.h @@ -25,7 +25,6 @@ #define __GST_SINESRC_H__ -#include #include #ifdef __cplusplus diff --git a/gst/tcp/gsttcp.c b/gst/tcp/gsttcp.c index 60e7d7943b..b22976a555 100644 --- a/gst/tcp/gsttcp.c +++ b/gst/tcp/gsttcp.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "gsttcpsrc.h" #include "gsttcpsink.h" diff --git a/gst/tcp/gsttcpplugin.c b/gst/tcp/gsttcpplugin.c index 60e7d7943b..b22976a555 100644 --- a/gst/tcp/gsttcpplugin.c +++ b/gst/tcp/gsttcpplugin.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "gsttcpsrc.h" #include "gsttcpsink.h" diff --git a/gst/tcp/gsttcpsink.h b/gst/tcp/gsttcpsink.h index 0dc41fad40..01b8bba626 100644 --- a/gst/tcp/gsttcpsink.h +++ b/gst/tcp/gsttcpsink.h @@ -22,7 +22,6 @@ #define __GST_TCPSINK_H__ -#include #include #ifdef __cplusplus diff --git a/gst/tcp/gsttcpsrc.h b/gst/tcp/gsttcpsrc.h index c87b771ccf..3506788bcb 100644 --- a/gst/tcp/gsttcpsrc.h +++ b/gst/tcp/gsttcpsrc.h @@ -21,7 +21,6 @@ #ifndef __GST_TCPSRC_H__ #define __GST_TCPSRC_H__ -#include #include #ifdef __cplusplus diff --git a/gst/videoscale/gstvideoscale.h b/gst/videoscale/gstvideoscale.h index 1bfd5acb8c..fd59b46f93 100644 --- a/gst/videoscale/gstvideoscale.h +++ b/gst/videoscale/gstvideoscale.h @@ -22,7 +22,6 @@ #define __GST_VIDEOSCALE_H__ -#include #include diff --git a/gst/videoscale/videoscale.c b/gst/videoscale/videoscale.c index cfb6218194..82103f3b56 100644 --- a/gst/videoscale/videoscale.c +++ b/gst/videoscale/videoscale.c @@ -21,13 +21,13 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif + #include #include #include #include #include -#include "config.h" #include "gstvideoscale.h" #undef HAVE_CPU_I386 #ifdef HAVE_CPU_I386 diff --git a/gst/videoscale/videoscale_x86.c b/gst/videoscale/videoscale_x86.c index 5385ddf383..4305000476 100644 --- a/gst/videoscale/videoscale_x86.c +++ b/gst/videoscale/videoscale_x86.c @@ -19,6 +19,10 @@ /*#define DEBUG_ENABLED */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "gstvideoscale.h" /* scalers */ diff --git a/gst/videotestsrc/gstvideotestsrc.h b/gst/videotestsrc/gstvideotestsrc.h index 365932a187..1e14b6328d 100644 --- a/gst/videotestsrc/gstvideotestsrc.h +++ b/gst/videotestsrc/gstvideotestsrc.h @@ -23,7 +23,6 @@ #define __GST_VIDEOTESTSRC_H__ -#include #include G_BEGIN_DECLS diff --git a/gst/videotestsrc/videotestsrc.c b/gst/videotestsrc/videotestsrc.c index 0005f4e83e..1ead6e7418 100644 --- a/gst/videotestsrc/videotestsrc.c +++ b/gst/videotestsrc/videotestsrc.c @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* non-GST-specific stuff */ /*#define DEBUG_ENABLED */ diff --git a/gst/volume/gstvolume.h b/gst/volume/gstvolume.h index 769d8ad42f..ed0468f77b 100644 --- a/gst/volume/gstvolume.h +++ b/gst/volume/gstvolume.h @@ -23,7 +23,6 @@ #define __GST_VOLUME_H__ -#include #include /* #include */ diff --git a/sys/v4l/gstv4l.c b/sys/v4l/gstv4l.c index 014f4976bd..3f8d2bcaa0 100644 --- a/sys/v4l/gstv4l.c +++ b/sys/v4l/gstv4l.c @@ -36,13 +36,14 @@ plugin_init (GstPlugin *plugin) if (!gst_library_load ("xwindowlistener")) return FALSE; - if (!gst_element_register (plugin, "v4lelement", GST_RANK_NONE, GST_TYPE_V4LELEMENT)) - return FALSE; - if (!gst_element_register (plugin, "v4lsrc", GST_RANK_NONE, GST_TYPE_V4LSRC)) - return FALSE; - if (!gst_element_register (plugin, "v4lmjpegsrc", GST_RANK_NONE, GST_TYPE_V4LMJPEGSRC)) - return FALSE; - if (!gst_element_register (plugin, "v4lmjpegsink", GST_RANK_NONE, GST_TYPE_V4LMJPEGSINK)) + if (!gst_element_register (plugin, "v4lelement", + GST_RANK_NONE, GST_TYPE_V4LELEMENT) || + !gst_element_register (plugin, "v4lsrc", + GST_RANK_NONE, GST_TYPE_V4LSRC) || + !gst_element_register (plugin, "v4lmjpegsrc", + GST_RANK_NONE, GST_TYPE_V4LMJPEGSRC) || + !gst_element_register (plugin, "v4lmjpegsink", + GST_RANK_NONE, GST_TYPE_V4LMJPEGSINK)) return FALSE; return TRUE; diff --git a/sys/v4l/gstv4lmjpegsink.c b/sys/v4l/gstv4lmjpegsink.c index 4f237bdb8a..5545f6574e 100644 --- a/sys/v4l/gstv4lmjpegsink.c +++ b/sys/v4l/gstv4lmjpegsink.c @@ -18,9 +18,6 @@ */ #ifdef HAVE_CONFIG_H -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include #endif diff --git a/sys/v4l/gstv4lmjpegsrc.c b/sys/v4l/gstv4lmjpegsrc.c index 2766bc3701..daf73a9976 100644 --- a/sys/v4l/gstv4lmjpegsrc.c +++ b/sys/v4l/gstv4lmjpegsrc.c @@ -18,9 +18,6 @@ */ #ifdef HAVE_CONFIG_H -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include #endif diff --git a/sys/v4l/gstv4lsrc.c b/sys/v4l/gstv4lsrc.c index d425f61940..d145d87744 100644 --- a/sys/v4l/gstv4lsrc.c +++ b/sys/v4l/gstv4lsrc.c @@ -18,9 +18,6 @@ */ #ifdef HAVE_CONFIG_H -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include #endif diff --git a/tests/old/testsuite/alsa/sinesrc.h b/tests/old/testsuite/alsa/sinesrc.h index ab352378f7..a5220a294d 100644 --- a/tests/old/testsuite/alsa/sinesrc.h +++ b/tests/old/testsuite/alsa/sinesrc.h @@ -22,7 +22,6 @@ #define __SINESRC_H__ -#include #include #ifdef __cplusplus diff --git a/testsuite/alsa/sinesrc.h b/testsuite/alsa/sinesrc.h index ab352378f7..a5220a294d 100644 --- a/testsuite/alsa/sinesrc.h +++ b/testsuite/alsa/sinesrc.h @@ -22,7 +22,6 @@ #define __SINESRC_H__ -#include #include #ifdef __cplusplus