From: Ronald S. Bultje Date: Fri, 7 Nov 2003 12:47:01 +0000 (+0000) Subject: Remove all config.h includes from header files, add it to each source file and remove... X-Git-Tag: CAPS-ROOT~66 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5621eae1c5881a490e3b2b1d3b17168569634674;p=platform%2Fupstream%2Fgst-plugins-good.git 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 --- diff --git a/ext/aalib/gstaasink.c b/ext/aalib/gstaasink.c index 7aa8fa512..4a7d8a401 100644 --- a/ext/aalib/gstaasink.c +++ b/ext/aalib/gstaasink.c @@ -20,7 +20,6 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include #include #include diff --git a/ext/flac/gstflac.c b/ext/flac/gstflac.c index eeed9c080..6b399eff3 100644 --- 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" diff --git a/ext/flac/gstflacdec.h b/ext/flac/gstflacdec.h index 67742ac6d..b5a1e1777 100644 --- a/ext/flac/gstflacdec.h +++ b/ext/flac/gstflacdec.h @@ -22,7 +22,6 @@ #define __FLACDEC_H__ -#include #include #include diff --git a/ext/flac/gstflacenc.h b/ext/flac/gstflacenc.h index 9c724b9c7..ac3254b06 100644 --- a/ext/flac/gstflacenc.h +++ b/ext/flac/gstflacenc.h @@ -22,7 +22,6 @@ #define __FLACENC_H__ -#include #include #include diff --git a/ext/ladspa/gstladspa.h b/ext/ladspa/gstladspa.h index 89a039e9c..b588ffa4e 100644 --- a/ext/ladspa/gstladspa.h +++ b/ext/ladspa/gstladspa.h @@ -24,7 +24,6 @@ #define __GST_LADSPA_H__ -#include #include #include diff --git a/ext/ladspa/load.c b/ext/ladspa/load.c index c912106fa..bf52eb1fd 100644 --- a/ext/ladspa/load.c +++ b/ext/ladspa/load.c @@ -5,6 +5,10 @@ /*****************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/ext/ladspa/search.c b/ext/ladspa/search.c index aac4381b6..08b28d121 100644 --- a/ext/ladspa/search.c +++ b/ext/ladspa/search.c @@ -5,6 +5,10 @@ /*****************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include diff --git a/ext/mikmod/drv_gst.c b/ext/mikmod/drv_gst.c index 122de610e..83d475ba7 100644 --- 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 #include "gstmikmod.h" diff --git a/ext/mikmod/gstmikmod.h b/ext/mikmod/gstmikmod.h index 686c484a0..9d5db8a52 100644 --- a/ext/mikmod/gstmikmod.h +++ b/ext/mikmod/gstmikmod.h @@ -21,7 +21,6 @@ #ifndef __GST_MIKMOD_H__ #define __GST_MIKMOD_H__ -#include #include #include diff --git a/ext/mikmod/mikmod_reader.c b/ext/mikmod/mikmod_reader.c index b850f5024..38b8402c0 100644 --- 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 #include diff --git a/ext/mikmod/mikmod_types.c b/ext/mikmod/mikmod_types.c index 8c4045d8b..f583d0823 100644 --- 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 #include "mikmod_types.h" #include /* memcmp */ diff --git a/ext/pango/gsttimeoverlay.c b/ext/pango/gsttimeoverlay.c index dba756124..6e1b7484d 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 bc3371536..505f8f049 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/raw1394/gstdv1394src.h b/ext/raw1394/gstdv1394src.h index 8de7c54de..72d0e1925 100644 --- a/ext/raw1394/gstdv1394src.h +++ b/ext/raw1394/gstdv1394src.h @@ -22,7 +22,6 @@ #define __GST_GST1394_H__ -#include #include #include diff --git a/ext/speex/gstspeexdec.h b/ext/speex/gstspeexdec.h index c6fe3e969..c679dc188 100644 --- a/ext/speex/gstspeexdec.h +++ b/ext/speex/gstspeexdec.h @@ -22,7 +22,6 @@ #define __GST_SPEEXDEC_H__ -#include #include #include diff --git a/ext/speex/gstspeexenc.h b/ext/speex/gstspeexenc.h index a7fa772ce..4677f6a1d 100644 --- a/ext/speex/gstspeexenc.h +++ b/ext/speex/gstspeexenc.h @@ -22,7 +22,6 @@ #define __GST_SPEEXENC_H__ -#include #include #include diff --git a/gst/auparse/gstauparse.h b/gst/auparse/gstauparse.h index 7b529c20a..d6e5a082f 100644 --- a/gst/auparse/gstauparse.h +++ b/gst/auparse/gstauparse.h @@ -22,7 +22,6 @@ #define __GST_AUPARSE_H__ -#include #include diff --git a/gst/avi/gstavidemux.h b/gst/avi/gstavidemux.h index d1c1d5829..a9334283d 100644 --- a/gst/avi/gstavidemux.h +++ b/gst/avi/gstavidemux.h @@ -22,7 +22,6 @@ #define __GST_AVI_DEMUX_H__ -#include #include #include #include diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index 8c8a4eaf0..ce4969320 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -28,7 +28,6 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include #include #include @@ -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) diff --git a/gst/cutter/gstcutter.h b/gst/cutter/gstcutter.h index 124cd0f4d..84166636b 100644 --- a/gst/cutter/gstcutter.h +++ b/gst/cutter/gstcutter.h @@ -22,7 +22,6 @@ #define __GST_CUTTER_H__ -#include #include /* #include */ diff --git a/gst/flx/flx_color.c b/gst/flx/flx_color.c index 8a84d2b09..b64c90c44 100644 --- 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 #include - #include "flx_color.h" FlxColorSpaceConverter * diff --git a/gst/goom/filters.c b/gst/goom/filters.c index 8fdabc180..5d74b6226 100644 --- 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" diff --git a/gst/goom/graphic.c b/gst/goom/graphic.c index 4223c67bd..cd24d49f2 100644 --- 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} ; diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c index a634633a5..bb0484011 100644 --- a/gst/goom/gstgoom.c +++ b/gst/goom/gstgoom.c @@ -20,7 +20,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include + #include #include #include "goom_core.h" diff --git a/gst/goom/lines.c b/gst/goom/lines.c index cadf92033..131fd002e 100644 --- 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 diff --git a/gst/law/alaw-decode.h b/gst/law/alaw-decode.h index 88c39adbe..aa3a418c2 100644 --- a/gst/law/alaw-decode.h +++ b/gst/law/alaw-decode.h @@ -22,7 +22,6 @@ #define __GST_ALAWDECODE_H__ -#include #include /* #include */ diff --git a/gst/law/alaw-encode.h b/gst/law/alaw-encode.h index a0eac9f74..e08010364 100644 --- a/gst/law/alaw-encode.h +++ b/gst/law/alaw-encode.h @@ -22,7 +22,6 @@ #define __GST_ALAWENCODE_H__ -#include #include /* #include */ diff --git a/gst/law/mulaw-conversion.c b/gst/law/mulaw-conversion.c index ad3fcce69..e921fb88a 100644 --- 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 #define ZEROTRAP /* turn on the trap as per the MIL-STD */ diff --git a/gst/law/mulaw-decode.h b/gst/law/mulaw-decode.h index dc3045e24..d34c8c068 100644 --- a/gst/law/mulaw-decode.h +++ b/gst/law/mulaw-decode.h @@ -22,7 +22,6 @@ #define __GST_MULAWDECODE_H__ -#include #include /* #include */ diff --git a/gst/law/mulaw-encode.h b/gst/law/mulaw-encode.h index b60188877..6d99759b5 100644 --- a/gst/law/mulaw-encode.h +++ b/gst/law/mulaw-encode.h @@ -22,7 +22,6 @@ #define __GST_MULAWENCODE_H__ -#include #include /* #include */ diff --git a/gst/level/demo.c b/gst/level/demo.c index 542e2d671..98781b467 100644 --- 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 #include diff --git a/gst/level/gstlevel.h b/gst/level/gstlevel.h index 371432750..59427c7dd 100644 --- a/gst/level/gstlevel.h +++ b/gst/level/gstlevel.h @@ -26,7 +26,6 @@ #define __GST_LEVEL_H__ -#include #include #include "gstlevel-marshal.h" diff --git a/gst/level/plot.c b/gst/level/plot.c index 4e770326b..27ecd01ac 100644 --- 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 #include diff --git a/gst/median/gstmedian.h b/gst/median/gstmedian.h index 26a2258f4..c22b80d1e 100644 --- a/gst/median/gstmedian.h +++ b/gst/median/gstmedian.h @@ -22,7 +22,6 @@ #define __GST_MEDIAN_H__ -#include #include diff --git a/gst/monoscope/convolve.c b/gst/monoscope/convolve.c index aefffa3ed..b707621b9 100644 --- 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 #include "convolve.h" diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c index b4169c2fd..27e3039aa 100644 --- a/gst/monoscope/gstmonoscope.c +++ b/gst/monoscope/gstmonoscope.c @@ -20,7 +20,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include + #include #include #include "monoscope.h" diff --git a/gst/monoscope/monoscope.c b/gst/monoscope/monoscope.c index 383581ea9..eb0e728a7 100644 --- 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 diff --git a/gst/smpte/barboxwipes.c b/gst/smpte/barboxwipes.c index e1cab9d07..a490f632a 100644 --- 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" diff --git a/gst/smpte/gstmask.c b/gst/smpte/gstmask.c index 6430f420d..13c79b344 100644 --- 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" diff --git a/gst/smpte/paint.c b/gst/smpte/paint.c index e912dfdf5..dae3c6f19 100644 --- 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 #include #include "paint.h" diff --git a/gst/udp/gstudp.c b/gst/udp/gstudp.c index f74b4b2df..d4d90bc26 100644 --- 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" diff --git a/gst/udp/gstudpsink.h b/gst/udp/gstudpsink.h index fe3a9f873..f49b4efe0 100644 --- a/gst/udp/gstudpsink.h +++ b/gst/udp/gstudpsink.h @@ -22,7 +22,6 @@ #define __GST_UDPSINK_H__ -#include #include #ifdef __cplusplus diff --git a/gst/udp/gstudpsrc.h b/gst/udp/gstudpsrc.h index 3311db7f1..f16673df3 100644 --- a/gst/udp/gstudpsrc.h +++ b/gst/udp/gstudpsrc.h @@ -21,7 +21,6 @@ #ifndef __GST_UDPSRC_H__ #define __GST_UDPSRC_H__ -#include #include #ifdef __cplusplus diff --git a/gst/videofilter/gstvideobalance.c b/gst/videofilter/gstvideobalance.c index 41fd93f6b..498e1e5a3 100644 --- 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 diff --git a/gst/videofilter/gstvideobalance.h b/gst/videofilter/gstvideobalance.h index 75bc11252..5c8b3cf40 100644 --- a/gst/videofilter/gstvideobalance.h +++ b/gst/videofilter/gstvideobalance.h @@ -22,7 +22,6 @@ #define __GST_VIDEOBALANCE_H__ -#include #include #include "gstvideofilter.h" diff --git a/gst/videofilter/gstvideofilter.c b/gst/videofilter/gstvideofilter.c index a7446887a..3eb92f9a2 100644 --- 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 diff --git a/gst/videofilter/gstvideofilter.h b/gst/videofilter/gstvideofilter.h index 786783506..fa7083284 100644 --- a/gst/videofilter/gstvideofilter.h +++ b/gst/videofilter/gstvideofilter.h @@ -22,7 +22,6 @@ #define __GST_VIDEOFILTER_H__ -#include #include diff --git a/gst/videofilter/gstvideoflip.h b/gst/videofilter/gstvideoflip.h index 9260a8c8d..b6aad296a 100644 --- a/gst/videofilter/gstvideoflip.h +++ b/gst/videofilter/gstvideoflip.h @@ -22,7 +22,6 @@ #define __GST_VIDEOFLIP_H__ -#include #include #include "gstvideofilter.h" diff --git a/gst/videofilter/gstvideotemplate.c b/gst/videofilter/gstvideotemplate.c index b37fa71e9..cc06b942b 100644 --- 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 diff --git a/gst/videofilter/gstvideotemplate.h b/gst/videofilter/gstvideotemplate.h index 625ac1f30..1a2c0a2db 100644 --- a/gst/videofilter/gstvideotemplate.h +++ b/gst/videofilter/gstvideotemplate.h @@ -22,7 +22,6 @@ #define __GST_VIDEOTEMPLATE_H__ -#include #include #include "gstvideofilter.h" diff --git a/gst/videoflip/gstvideoflip.h b/gst/videoflip/gstvideoflip.h index e3463e5ed..b14b0bd3a 100644 --- a/gst/videoflip/gstvideoflip.h +++ b/gst/videoflip/gstvideoflip.h @@ -22,7 +22,6 @@ #define __GST_VIDEOFLIP_H__ -#include #include diff --git a/gst/videoflip/videoflip.c b/gst/videoflip/videoflip.c index b5ab9e07d..f108ea622 100644 --- a/gst/videoflip/videoflip.c +++ b/gst/videoflip/videoflip.c @@ -21,13 +21,13 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif + #include #include #include #include #include -#include "config.h" #include "gstvideoflip.h" static void gst_videoflip_planar411 (GstVideoflip *scale, unsigned char *dest, unsigned char *src); diff --git a/gst/wavenc/gstwavenc.h b/gst/wavenc/gstwavenc.h index a379155a1..6c3f56f08 100644 --- a/gst/wavenc/gstwavenc.h +++ b/gst/wavenc/gstwavenc.h @@ -22,7 +22,6 @@ #define __GST_WAVENC_H__ -#include #include G_BEGIN_DECLS diff --git a/gst/wavparse/gstwavparse.h b/gst/wavparse/gstwavparse.h index 485c7554a..d45cde51c 100644 --- a/gst/wavparse/gstwavparse.h +++ b/gst/wavparse/gstwavparse.h @@ -22,7 +22,6 @@ #define __GST_WAVPARSE_H__ -#include #include #include #include diff --git a/sys/oss/gstossgst.h b/sys/oss/gstossgst.h index df0a8e15b..d521ea048 100644 --- a/sys/oss/gstossgst.h +++ b/sys/oss/gstossgst.h @@ -25,7 +25,6 @@ #define __GST_OSSGST_H__ -#include #include #include diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c index 521196cf4..576b0c0bd 100644 --- 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 #include #include