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
2003-11-07 12:47:01 +00:00 · 2003-11-07 12:47:01 +00:00 · 5621eae1c5
commit 5621eae1c5
parent 079e4b4e95
56 changed files with 95 additions and 34 deletions
--- a/ext/aalib/gstaasink.c
+++ b/ext/aalib/gstaasink.c
@ -20,7 +20,6 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <config.h>

 #include <string.h>
 #include <sys/time.h>
--- a/ext/flac/gstflac.c
+++ b/ext/flac/gstflac.c
@ -17,6 +17,9 @@
 * Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif

 #include "gstflacenc.h"
 #include "gstflacdec.h"
--- a/ext/flac/gstflacdec.h
+++ b/ext/flac/gstflacdec.h
@ -22,7 +22,6 @@
 #define __FLACDEC_H__


-#include <config.h>
 #include <gst/gst.h>
 #include <gst/bytestream/bytestream.h>

--- a/ext/flac/gstflacenc.h
+++ b/ext/flac/gstflacenc.h
@ -22,7 +22,6 @@
 #define __FLACENC_H__


-#include <config.h>
 #include <gst/gst.h>

 #include <FLAC/all.h>
--- a/ext/ladspa/gstladspa.h
+++ b/ext/ladspa/gstladspa.h
@ -24,7 +24,6 @@
 #define __GST_LADSPA_H__


-#include <config.h>
 #include <gst/gst.h>
 #include <gst/bytestream/bytestream.h>

--- a/ext/ladspa/load.c
+++ b/ext/ladspa/load.c
@ -5,6 +5,10 @@

 /*****************************************************************************/

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <dlfcn.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/ext/ladspa/search.c
+++ b/ext/ladspa/search.c
@ -5,6 +5,10 @@

 /*****************************************************************************/

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <dirent.h>
 #include <dlfcn.h>
 #include <stdio.h>
--- a/ext/mikmod/drv_gst.c
+++ b/ext/mikmod/drv_gst.c
@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>

 #include "gstmikmod.h"
--- a/ext/mikmod/gstmikmod.h
+++ b/ext/mikmod/gstmikmod.h
@ -21,7 +21,6 @@
 #ifndef __GST_MIKMOD_H__
 #define __GST_MIKMOD_H__

-#include <config.h>
 #include <mikmod.h>
 #include <gst/gst.h>

--- a/ext/mikmod/mikmod_reader.c
+++ b/ext/mikmod/mikmod_reader.c
@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <unistd.h>
 #include <string.h>

--- a/ext/mikmod/mikmod_types.c
+++ b/ext/mikmod/mikmod_types.c
@ -16,7 +16,11 @@
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */
- 
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gst/gst.h>
 #include "mikmod_types.h"
 #include <string.h>		/* memcmp */
--- 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 <gsttimeoverlay.h>
--- a/ext/pango/gsttimeoverlay.h
+++ b/ext/pango/gsttimeoverlay.h
@ -22,7 +22,6 @@
 #define __GST_TIMEOVERLAY_H__


-#include <config.h>
 #include <gst/gst.h>
 #include <pango/pango.h>

--- a/ext/raw1394/gstdv1394src.h
+++ b/ext/raw1394/gstdv1394src.h
@ -22,7 +22,6 @@
 #define __GST_GST1394_H__


-#include <config.h>
 #include <gst/gst.h>
 #include <libraw1394/raw1394.h>

--- a/ext/speex/gstspeexdec.h
+++ b/ext/speex/gstspeexdec.h
@ -22,7 +22,6 @@
 #define __GST_SPEEXDEC_H__


-#include <config.h>
 #include <gst/gst.h>
 #include <speex.h>

--- a/ext/speex/gstspeexenc.h
+++ b/ext/speex/gstspeexenc.h
@ -22,7 +22,6 @@
 #define __GST_SPEEXENC_H__


-#include <config.h>
 #include <gst/gst.h>

 #include <speex.h>
--- a/gst/auparse/gstauparse.h
+++ b/gst/auparse/gstauparse.h
@ -22,7 +22,6 @@
 #define __GST_AUPARSE_H__


-#include <config.h>
 #include <gst/gst.h>


--- a/gst/avi/gstavidemux.h
+++ b/gst/avi/gstavidemux.h
@ -22,7 +22,6 @@
 #define __GST_AVI_DEMUX_H__


-#include <config.h>
 #include <gst/gst.h>
 #include <gst/bytestream/bytestream.h>
 #include <gst/riff/riff.h>
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@ -28,7 +28,6 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <config.h>

 #include <stdlib.h>
 #include <string.h>
@ -170,6 +169,7 @@ GST_PAD_TEMPLATE_FACTORY (audio_sink_factory,
  GST_CAPS_NEW (
    "avimux_sink_audio_mpeg",
    "audio/mpeg",
+      "mpegversion",      GST_PROPS_INT (1),
      "layer",		  GST_PROPS_INT_RANGE (1, 3),
      "rate",             GST_PROPS_INT_RANGE (1000, 96000),
      "channels",         GST_PROPS_INT_RANGE (1, 2)
--- a/gst/cutter/gstcutter.h
+++ b/gst/cutter/gstcutter.h
@ -22,7 +22,6 @@
 #define __GST_CUTTER_H__


-#include <config.h>
 #include <gst/gst.h>
 /* #include <gst/meta/audioraw.h> */

--- a/gst/flx/flx_color.c
+++ b/gst/flx/flx_color.c
@ -17,10 +17,13 @@
 * Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <gst/gst.h>

-
 #include "flx_color.h"

 FlxColorSpaceConverter *
--- a/gst/goom/filters.c
+++ b/gst/goom/filters.c
@ -12,6 +12,10 @@

 /*#define _DEBUG_PIXEL; */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "filters.h"
 #include "graphic.h"
 #include "goom_tools.h"
--- a/gst/goom/graphic.c
+++ b/gst/goom/graphic.c
@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "graphic.h"

 const Color BLACK = {0,0,0} ;
--- a/gst/goom/gstgoom.c
+++ b/gst/goom/gstgoom.c
@ -20,7 +20,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <config.h>
+
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include "goom_core.h"
--- a/gst/goom/lines.c
+++ b/gst/goom/lines.c
@ -7,6 +7,10 @@
 *
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "lines.h"
 #include <math.h>

--- a/gst/law/alaw-decode.h
+++ b/gst/law/alaw-decode.h
@ -22,7 +22,6 @@
 #define __GST_ALAWDECODE_H__


-#include <config.h>
 #include <gst/gst.h>
 /* #include <gst/meta/audioraw.h> */

--- a/gst/law/alaw-encode.h
+++ b/gst/law/alaw-encode.h
@ -22,7 +22,6 @@
 #define __GST_ALAWENCODE_H__


-#include <config.h>
 #include <gst/gst.h>
 /* #include <gst/meta/audioraw.h> */

--- a/gst/law/mulaw-conversion.c
+++ b/gst/law/mulaw-conversion.c
@ -19,6 +19,10 @@
 * Output: 8 bit ulaw sample
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib.h>

 #define ZEROTRAP    /* turn on the trap as per the MIL-STD */
--- a/gst/law/mulaw-decode.h
+++ b/gst/law/mulaw-decode.h
@ -22,7 +22,6 @@
 #define __GST_MULAWDECODE_H__


-#include <config.h>
 #include <gst/gst.h>
 /* #include <gst/meta/audioraw.h> */

--- a/gst/law/mulaw-encode.h
+++ b/gst/law/mulaw-encode.h
@ -22,7 +22,6 @@
 #define __GST_MULAWENCODE_H__


-#include <config.h>
 #include <gst/gst.h>
 /* #include <gst/meta/audioraw.h> */

--- a/gst/level/demo.c
+++ b/gst/level/demo.c
@ -21,6 +21,10 @@
 * Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gst/gst.h>
 #include <gtk/gtk.h>

--- a/gst/level/gstlevel.h
+++ b/gst/level/gstlevel.h
@ -26,7 +26,6 @@
 #define __GST_LEVEL_H__


-#include <config.h>
 #include <gst/gst.h>

 #include "gstlevel-marshal.h"
--- a/gst/level/plot.c
+++ b/gst/level/plot.c
@ -21,6 +21,10 @@
 * Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gst/gst.h>
 #include <gtk/gtk.h>

--- a/gst/median/gstmedian.h
+++ b/gst/median/gstmedian.h
@ -22,7 +22,6 @@
 #define __GST_MEDIAN_H__


-#include <config.h>
 #include <gst/gst.h>


--- a/gst/monoscope/convolve.c
+++ b/gst/monoscope/convolve.c
@ -55,6 +55,10 @@
 * convolution", or "combine these three length 2^n outputs into one
 * 2^{n+1} output." */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include "convolve.h"

--- a/gst/monoscope/gstmonoscope.c
+++ b/gst/monoscope/gstmonoscope.c
@ -20,7 +20,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <config.h>
+
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include "monoscope.h"
--- a/gst/monoscope/monoscope.c
+++ b/gst/monoscope/monoscope.c
@ -19,6 +19,11 @@
 *  along with this program; 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 "monoscope.h"

 #include <string.h>
--- a/gst/smpte/barboxwipes.c
+++ b/gst/smpte/barboxwipes.c
@ -17,6 +17,10 @@
 * Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "paint.h"
 #include "gstmask.h"

--- a/gst/smpte/gstmask.c
+++ b/gst/smpte/gstmask.c
@ -17,6 +17,9 @@
 * Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif

 #include "gstmask.h"
 #include "paint.h"
--- a/gst/smpte/paint.c
+++ b/gst/smpte/paint.c
@ -17,6 +17,10 @@
 * Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <math.h>
 #include <stdlib.h>
 #include "paint.h"
--- a/gst/udp/gstudp.c
+++ b/gst/udp/gstudp.c
@ -17,6 +17,9 @@
 * Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif

 #include "gstudpsrc.h"
 #include "gstudpsink.h"
--- a/gst/udp/gstudpsink.h
+++ b/gst/udp/gstudpsink.h
@ -22,7 +22,6 @@
 #define __GST_UDPSINK_H__


-#include <config.h>
 #include <gst/gst.h>

 #ifdef __cplusplus
--- a/gst/udp/gstudpsrc.h
+++ b/gst/udp/gstudpsrc.h
@ -21,7 +21,6 @@
 #ifndef __GST_UDPSRC_H__
 #define __GST_UDPSRC_H__

-#include <config.h>
 #include <gst/gst.h>

 #ifdef __cplusplus
--- a/gst/videofilter/gstvideobalance.c
+++ b/gst/videofilter/gstvideobalance.c
@ -18,6 +18,9 @@
 * Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif

 /*#define DEBUG_ENABLED */
 #include <gstvideobalance.h>
--- a/gst/videofilter/gstvideobalance.h
+++ b/gst/videofilter/gstvideobalance.h
@ -22,7 +22,6 @@
 #define __GST_VIDEOBALANCE_H__


-#include <config.h>
 #include <gst/gst.h>

 #include "gstvideofilter.h"
--- a/gst/videofilter/gstvideofilter.c
+++ b/gst/videofilter/gstvideofilter.c
@ -18,6 +18,9 @@
 * Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif

 /*#define DEBUG_ENABLED */
 #include <gstvideofilter.h>
--- a/gst/videofilter/gstvideofilter.h
+++ b/gst/videofilter/gstvideofilter.h
@ -22,7 +22,6 @@
 #define __GST_VIDEOFILTER_H__


-#include <config.h>
 #include <gst/gst.h>


--- a/gst/videofilter/gstvideoflip.h
+++ b/gst/videofilter/gstvideoflip.h
@ -22,7 +22,6 @@
 #define __GST_VIDEOFLIP_H__


-#include <config.h>
 #include <gst/gst.h>

 #include "gstvideofilter.h"
--- a/gst/videofilter/gstvideotemplate.c
+++ b/gst/videofilter/gstvideotemplate.c
@ -18,6 +18,9 @@
 * Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif

 /*#define DEBUG_ENABLED */
 #include <gstvideotemplate.h>
--- a/gst/videofilter/gstvideotemplate.h
+++ b/gst/videofilter/gstvideotemplate.h
@ -22,7 +22,6 @@
 #define __GST_VIDEOTEMPLATE_H__


-#include <config.h>
 #include <gst/gst.h>

 #include "gstvideofilter.h"
--- a/gst/videoflip/gstvideoflip.h
+++ b/gst/videoflip/gstvideoflip.h
@ -22,7 +22,6 @@
 #define __GST_VIDEOFLIP_H__


-#include <config.h>
 #include <gst/gst.h>


--- a/gst/videoflip/videoflip.c
+++ b/gst/videoflip/videoflip.c
@ -21,13 +21,13 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
 #include <gst/gst.h>
 #include <stdlib.h>
 #include <math.h>
 #include <videoflip.h>
 #include <string.h>

-#include "config.h"
 #include "gstvideoflip.h"

 static void gst_videoflip_planar411 (GstVideoflip *scale, unsigned char *dest, unsigned char *src);
--- a/gst/wavenc/gstwavenc.h
+++ b/gst/wavenc/gstwavenc.h
@ -22,7 +22,6 @@
 #define __GST_WAVENC_H__


-#include <config.h>
 #include <gst/gst.h>

 G_BEGIN_DECLS
--- a/gst/wavparse/gstwavparse.h
+++ b/gst/wavparse/gstwavparse.h
@ -22,7 +22,6 @@
 #define __GST_WAVPARSE_H__


-#include <config.h>
 #include <gst/gst.h>
 #include <riff.h>
 #include <gst/bytestream/bytestream.h>
--- a/sys/oss/gstossgst.h
+++ b/sys/oss/gstossgst.h
@ -25,7 +25,6 @@
 #define __GST_OSSGST_H__


-#include <config.h>
 #include <gst/gst.h>

 #include <sys/types.h>
--- a/sys/v4l2/v4l2src_calls.c
+++ b/sys/v4l2/v4l2src_calls.c
@ -17,6 +17,10 @@
 * Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>