diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-07 18:54:56 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-07 18:54:56 +0000 |
commit | 73c525e6e2dbcf452c2e78e44a63678f2b2068ea (patch) | |
tree | f9408ad7864dc1683b929f25a692213b22442992 /codecs | |
parent | 3cd1c6869dcb5f1d85a602c7b53a33437ceb0d32 (diff) |
simplify autoconfig include mechanism (make tholo happy he can use lint again :-)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@32846 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r-- | codecs/codec_a_mu.c | 8 | ||||
-rw-r--r-- | codecs/codec_adpcm.c | 7 | ||||
-rw-r--r-- | codecs/codec_alaw.c | 8 | ||||
-rw-r--r-- | codecs/codec_g723_1.c | 18 | ||||
-rw-r--r-- | codecs/codec_g726.c | 8 | ||||
-rw-r--r-- | codecs/codec_gsm.c | 8 | ||||
-rw-r--r-- | codecs/codec_ilbc.c | 8 | ||||
-rw-r--r-- | codecs/codec_lpc10.c | 8 | ||||
-rw-r--r-- | codecs/codec_speex.c | 34 | ||||
-rw-r--r-- | codecs/codec_ulaw.c | 8 |
10 files changed, 57 insertions, 58 deletions
diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c index 05dbe5c73..c67bdd472 100644 --- a/codecs/codec_a_mu.c +++ b/codecs/codec_a_mu.c @@ -23,6 +23,10 @@ * \ingroup codecs */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <fcntl.h> #include <netinet/in.h> #include <stdio.h> @@ -30,10 +34,6 @@ #include <string.h> #include <unistd.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/logger.h" #include "asterisk/module.h" diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c index 80ec375f8..9ab358ff5 100644 --- a/codecs/codec_adpcm.c +++ b/codecs/codec_adpcm.c @@ -27,6 +27,9 @@ * \ingroup codecs */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <fcntl.h> #include <netinet/in.h> @@ -35,10 +38,6 @@ #include <string.h> #include <unistd.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/logger.h" #include "asterisk/linkedlists.h" diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c index f0e066703..6def3f723 100644 --- a/codecs/codec_alaw.c +++ b/codecs/codec_alaw.c @@ -23,6 +23,10 @@ * \ingroup codecs */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <fcntl.h> #include <netinet/in.h> #include <stdio.h> @@ -30,10 +34,6 @@ #include <string.h> #include <unistd.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/logger.h" #include "asterisk/module.h" diff --git a/codecs/codec_g723_1.c b/codecs/codec_g723_1.c index 87ccba82e..5da9492a7 100644 --- a/codecs/codec_g723_1.c +++ b/codecs/codec_g723_1.c @@ -31,11 +31,9 @@ <defaultenabled>no</defaultenabled> ***/ -#define TYPE_HIGH 0x0 -#define TYPE_LOW 0x1 -#define TYPE_SILENCE 0x2 -#define TYPE_DONTSEND 0x3 -#define TYPE_MASK 0x3 +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/types.h> #include <fcntl.h> @@ -45,10 +43,6 @@ #include <string.h> #include <stdio.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/translate.h" #include "asterisk/module.h" @@ -78,6 +72,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "slin_g723_ex.h" #include "g723_slin_ex.h" +#define TYPE_HIGH 0x0 +#define TYPE_LOW 0x1 +#define TYPE_SILENCE 0x2 +#define TYPE_DONTSEND 0x3 +#define TYPE_MASK 0x3 + /* g723_1 has 240 samples per buffer. * We want a buffer which is a multiple... */ diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c index 3b979eb63..f4cfdd749 100644 --- a/codecs/codec_g726.c +++ b/codecs/codec_g726.c @@ -26,6 +26,10 @@ * \ingroup codecs */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <fcntl.h> #include <netinet/in.h> #include <stdio.h> @@ -33,10 +37,6 @@ #include <string.h> #include <unistd.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/logger.h" #include "asterisk/linkedlists.h" diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c index fc13debbc..c7b0b100c 100644 --- a/codecs/codec_gsm.c +++ b/codecs/codec_gsm.c @@ -30,6 +30,10 @@ <depend>libgsm</depend> ***/ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <fcntl.h> #include <stdlib.h> #include <unistd.h> @@ -37,10 +41,6 @@ #include <string.h> #include <stdio.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/translate.h" #include "asterisk/config.h" diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c index cc4f88307..e41e4776f 100644 --- a/codecs/codec_ilbc.c +++ b/codecs/codec_ilbc.c @@ -25,6 +25,10 @@ * \ingroup codecs */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <fcntl.h> #include <stdlib.h> #include <unistd.h> @@ -32,10 +36,6 @@ #include <string.h> #include <stdio.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/translate.h" #include "asterisk/module.h" diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c index 1904368b9..8f1c81a43 100644 --- a/codecs/codec_lpc10.c +++ b/codecs/codec_lpc10.c @@ -27,6 +27,10 @@ * \ingroup codecs */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <fcntl.h> #include <stdlib.h> #include <unistd.h> @@ -34,10 +38,6 @@ #include <string.h> #include <stdio.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/translate.h" #include "asterisk/config.h" diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c index 5f871b460..81808f9fd 100644 --- a/codecs/codec_speex.c +++ b/codecs/codec_speex.c @@ -31,6 +31,10 @@ <depend>libspeex</depend> ***/ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <fcntl.h> #include <stdlib.h> #include <unistd.h> @@ -45,6 +49,19 @@ #include <speex/speex_preprocess.h> #endif +#include "asterisk/lock.h" +#include "asterisk/translate.h" +#include "asterisk/module.h" +#include "asterisk/config.h" +#include "asterisk/options.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/utils.h" + +/* Sample frame data */ +#include "slin_speex_ex.h" +#include "speex_slin_ex.h" + /* codec variables */ static int quality = 3; static int complexity = 2; @@ -69,23 +86,6 @@ static float pp_dereverb_level = 0.3; #define TYPE_LOW 0x1 #define TYPE_MASK 0x3 -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - -#include "asterisk/lock.h" -#include "asterisk/translate.h" -#include "asterisk/module.h" -#include "asterisk/config.h" -#include "asterisk/options.h" -#include "asterisk/logger.h" -#include "asterisk/channel.h" -#include "asterisk/utils.h" - -/* Sample frame data */ -#include "slin_speex_ex.h" -#include "speex_slin_ex.h" - #define BUFFER_SAMPLES 8000 #define SPEEX_SAMPLES 160 diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c index 521b84237..7544cdf17 100644 --- a/codecs/codec_ulaw.c +++ b/codecs/codec_ulaw.c @@ -23,6 +23,10 @@ * \ingroup codecs */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include <fcntl.h> #include <netinet/in.h> #include <stdio.h> @@ -30,10 +34,6 @@ #include <string.h> #include <unistd.h> -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/lock.h" #include "asterisk/logger.h" #include "asterisk/module.h" |