040624src.txt ------------- ast_expr.y: Use the system's definition of QUAD_MIN on Fedora 2 and others that define LONG_LONG_MIN in limits.h. chan_alsa.c: #ifdef 0 out unused variable. chan_h323.c resolve duplicate definitions of *_cb. resolve namespace clash among include files. resolve pointer conversion warnings from g++. channels/chan_iax2.c: make find_tpeer() staic since almost everything else in the files is, and it isn't used or defined as exported anywhere else. Otherwise the compiler complains about the lack of a prototype. channels/h323/ast_h323.cpp: resolve clash among include files. wrap C language headers in extern "C" {}. channels/h323/ast_h323.h resolve clash amoung headers. channels/h323/chan_h323.h change *_cb definitions into declarations, so that they are not multiply defined. codecs/gsm/inc/config.h Use '#if 0' to comment out unused symbols rather than '/*' to avoid compiler warnings about nested comments. codecs/lpc10/* Enable -DP_R_O_T_O_T_Y_P_E_S, which identifies mismatch of function declarations. Resolve mismatch of a few functions that were declared as returning void but defined to return int. put declarations of f2c library functions into f2c.h. Move '#include "f2c.h" prior to subsequent usage of various types defined in f2c.h in the .c files. Index: ast_expr.y =================================================================== RCS file: /usr/cvsroot/asterisk/ast_expr.y,v retrieving revision 1.7 diff -u -r1.7 ast_expr.y --- ast_expr.y 21 Jun 2004 18:20:17 -0000 1.7 +++ ast_expr.y 25 Jun 2004 02:41:05 -0000 @@ -20,6 +20,13 @@ #include #include +#ifdef LONG_LONG_MIN +#define QUAD_MIN LONG_LONG_MIN +#endif +#ifdef LONG_LONG_MAX +#define QUAD_MAX LONG_LONG_MAX +#endif + # if ! defined(QUAD_MIN) # define QUAD_MIN (-0x7fffffffffffffffL-1) # endif Index: channels/chan_alsa.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_alsa.c,v retrieving revision 1.19 diff -u -r1.19 chan_alsa.c --- channels/chan_alsa.c 24 Jun 2004 13:27:44 -0000 1.19 +++ channels/chan_alsa.c 25 Jun 2004 02:41:06 -0000 @@ -330,7 +330,9 @@ snd_pcm_uframes_t buffer_size = 0; unsigned int rate = DESIRED_RATE; +#if 0 unsigned int per_min = 1; +#endif //unsigned int per_max = 8; snd_pcm_uframes_t start_threshold, stop_threshold; Index: channels/chan_h323.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v retrieving revision 1.61 diff -u -r1.61 chan_h323.c --- channels/chan_h323.c 22 Jun 2004 18:48:59 -0000 1.61 +++ channels/chan_h323.c 25 Jun 2004 02:41:07 -0000 @@ -27,8 +27,29 @@ */ +#include +#include +#include +#if defined(BSD) +#ifndef IPTOS_MINCOST +#define IPTOS_MINCOST 0x02 +#endif +#endif +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#ifdef __cplusplus +extern "C" { +#endif #include #include #include @@ -46,25 +67,23 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#if defined(BSD) -#include -#ifndef IPTOS_MINCOST -#define IPTOS_MINCOST 0x02 -#endif +#ifdef __cplusplus +} #endif -#include - #include "h323/chan_h323.h" +send_digit_cb on_send_digit; +on_connection_cb on_create_connection; +setup_incoming_cb on_incoming_call; +setup_outbound_cb on_outgoing_call; +start_logchan_cb on_start_logical_channel; +chan_ringing_cb on_chan_ringing; +con_established_cb on_connection_established; +clear_con_cb on_connection_cleared; +answer_call_cb on_answer_call; + +int h323debug; + /** String variables required by ASTERISK */ static char *type = "H323"; static char *desc = "The NuFone Network's Open H.323 Channel Driver"; @@ -322,7 +341,7 @@ ast_mutex_unlock(&peerl.lock); } else { ast_mutex_unlock(&peerl.lock); - peer = malloc(sizeof(struct oh323_peer)); + peer = (struct oh323_peer*)malloc(sizeof(struct oh323_peer)); memset(peer, 0, sizeof(struct oh323_peer)); } if (peer) { @@ -373,7 +392,7 @@ */ static int oh323_digit(struct ast_channel *c, char digit) { - struct oh323_pvt *p = c->pvt->pvt; + struct oh323_pvt *p = (struct oh323_pvt *) c->pvt->pvt; if (p && p->rtp && (p->dtmfmode & H323_DTMF_RFC2833)) { ast_rtp_senddigit(p->rtp, digit); } @@ -393,7 +412,7 @@ static int oh323_call(struct ast_channel *c, char *dest, int timeout) { int res; - struct oh323_pvt *p = c->pvt->pvt; + struct oh323_pvt *p = (struct oh323_pvt *) c->pvt->pvt; char called_addr[256]; char *tmp, *cid, *cidname, oldcid[256]; @@ -480,7 +499,7 @@ { int res; - struct oh323_pvt *p = c->pvt->pvt; + struct oh323_pvt *p = (struct oh323_pvt *) c->pvt->pvt; res = h323_answering_call(p->cd.call_token, 0); @@ -492,7 +511,7 @@ static int oh323_hangup(struct ast_channel *c) { - struct oh323_pvt *p = c->pvt->pvt; + struct oh323_pvt *p = (struct oh323_pvt *) c->pvt->pvt; int needcancel = 0; if (h323debug) ast_log(LOG_DEBUG, "oh323_hangup(%s)\n", c->name); @@ -510,7 +529,7 @@ if (!c || (c->_state != AST_STATE_UP)) needcancel = 1; /* Disconnect */ - p = c->pvt->pvt; + p = (struct oh323_pvt *) c->pvt->pvt; /* Free dsp used for in-band DTMF detection */ if (p->vad) { @@ -584,7 +603,7 @@ static struct ast_frame *oh323_read(struct ast_channel *c) { struct ast_frame *fr; - struct oh323_pvt *p = c->pvt->pvt; + struct oh323_pvt *p = (struct oh323_pvt *) c->pvt->pvt; ast_mutex_lock(&p->lock); fr = oh323_rtp_read(p); ast_mutex_unlock(&p->lock); @@ -593,7 +612,7 @@ static int oh323_write(struct ast_channel *c, struct ast_frame *frame) { - struct oh323_pvt *p = c->pvt->pvt; + struct oh323_pvt *p = (struct oh323_pvt *) c->pvt->pvt; int res = 0; if (frame->frametype != AST_FRAME_VOICE) { if (frame->frametype == AST_FRAME_IMAGE) @@ -623,7 +642,7 @@ static int oh323_indicate(struct ast_channel *c, int condition) { - struct oh323_pvt *p = c->pvt->pvt; + struct oh323_pvt *p = (struct oh323_pvt *) c->pvt->pvt; switch(condition) { case AST_CONTROL_RINGING: @@ -668,7 +687,7 @@ // FIXME: WTF is this? Do I need this??? static int oh323_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) { - struct oh323_pvt *p = newchan->pvt->pvt; + struct oh323_pvt *p = (struct oh323_pvt *) newchan->pvt->pvt; ast_mutex_lock(&p->lock); if (p->owner != oldchan) { @@ -755,7 +774,7 @@ { struct oh323_pvt *p; - p = malloc(sizeof(struct oh323_pvt)); + p = (struct oh323_pvt *) malloc(sizeof(struct oh323_pvt)); if (!p) { ast_log(LOG_ERROR, "Couldn't allocate private structure. This is bad\n"); return NULL; @@ -796,7 +815,7 @@ p = iflist; while(p) { - if (p->cd.call_reference == call_reference) { + if ((signed int)p->cd.call_reference == call_reference) { /* Found the call */ ast_mutex_unlock(&iflock); return p; @@ -814,7 +833,7 @@ int oldformat; struct oh323_pvt *p; struct ast_channel *tmpc = NULL; - char *dest = data; + char *dest = (char *) data; char *ext, *host; char *h323id = NULL; char tmp[256]; @@ -980,7 +999,7 @@ struct sockaddr_in them; struct rtp_info *info; - info = malloc(sizeof(struct rtp_info)); + info = (struct rtp_info *) malloc(sizeof(struct rtp_info)); p = find_call(call_reference); @@ -1769,7 +1788,7 @@ static struct ast_rtp *oh323_get_rtp_peer(struct ast_channel *chan) { struct oh323_pvt *p; - p = chan->pvt->pvt; + p = (struct oh323_pvt *) chan->pvt->pvt; if (p && p->rtp && p->bridge) { return p->rtp; } @@ -1821,7 +1840,7 @@ return 0; } - p = chan->pvt->pvt; + p = (struct oh323_pvt *) chan->pvt->pvt; if (!p) { ast_log(LOG_ERROR, "No Private Structure, this is bad\n"); return -1; Index: channels/chan_iax2.c =================================================================== RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v retrieving revision 1.158 diff -u -r1.158 chan_iax2.c --- channels/chan_iax2.c 22 Jun 2004 18:49:00 -0000 1.158 +++ channels/chan_iax2.c 25 Jun 2004 02:41:12 -0000 @@ -2722,7 +2722,7 @@ return ms; } -struct iax2_trunk_peer *find_tpeer(struct sockaddr_in *sin) +static struct iax2_trunk_peer *find_tpeer(struct sockaddr_in *sin) { struct iax2_trunk_peer *tpeer; /* Finds and locks trunk peer */ Index: channels/h323/ast_h323.cpp =================================================================== RCS file: /usr/cvsroot/asterisk/channels/h323/ast_h323.cpp,v retrieving revision 1.51 diff -u -r1.51 ast_h323.cpp --- channels/h323/ast_h323.cpp 15 Jun 2004 20:56:06 -0000 1.51 +++ channels/h323/ast_h323.cpp 25 Jun 2004 02:41:12 -0000 @@ -25,9 +25,28 @@ * * Version Info: $Id: ast_h323.cpp,v 1.51 2004/06/15 20:56:06 jeremy Exp $ */ +#include + +#include +#include +#include + +#include +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif #include -#include "ast_h323.h" +#ifdef __cplusplus +} +#endif +#include "chan_h323.h" +#include "ast_h323.h" /* PWlib Required Components */ #define MAJOR_VERSION 1 Index: channels/h323/ast_h323.h =================================================================== RCS file: /usr/cvsroot/asterisk/channels/h323/ast_h323.h,v retrieving revision 1.23 diff -u -r1.23 ast_h323.h --- channels/h323/ast_h323.h 25 May 2004 02:27:59 -0000 1.23 +++ channels/h323/ast_h323.h 25 Jun 2004 02:41:13 -0000 @@ -26,18 +26,8 @@ * Version Info: $Id: ast_h323.h,v 1.23 2004/05/25 02:27:59 jeremy Exp $ */ - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "chan_h323.h" +#ifndef AST_H323_H +#define AST_H323_H /** These need to be redefined here because the C++ side of this driver is blind to the asterisk headers */ @@ -306,3 +296,4 @@ }; +#endif /* !defined AST_H323_H */ Index: channels/h323/chan_h323.h =================================================================== RCS file: /usr/cvsroot/asterisk/channels/h323/chan_h323.h,v retrieving revision 1.21 diff -u -r1.21 chan_h323.h --- channels/h323/chan_h323.h 15 Jun 2004 20:56:06 -0000 1.21 +++ channels/h323/chan_h323.h 25 Jun 2004 02:41:13 -0000 @@ -116,48 +116,48 @@ /* This is a callback prototype function, called pass DTMF down the RTP. */ typedef int (*send_digit_cb)(unsigned, char); -send_digit_cb on_send_digit; +extern send_digit_cb on_send_digit; /* This is a callback prototype function, called to collect the external RTP port from Asterisk. */ typedef rtp_info_t *(*on_connection_cb)(unsigned); -on_connection_cb on_create_connection; +extern on_connection_cb on_create_connection; /* This is a callback prototype function, called upon an incoming call happens. */ typedef int (*setup_incoming_cb)(call_details_t); -setup_incoming_cb on_incoming_call; +extern setup_incoming_cb on_incoming_call; /* This is a callback prototype function, called upon an outbound call. */ typedef int (*setup_outbound_cb)(call_details_t); -setup_outbound_cb on_outgoing_call; +extern setup_outbound_cb on_outgoing_call; /* This is a callback prototype function, called when the openh323 OnStartLogicalChannel is invoked. */ typedef void (*start_logchan_cb)(unsigned int, const char *, int); -start_logchan_cb on_start_logical_channel; +extern start_logchan_cb on_start_logical_channel; /* This is a callback prototype function, called when openh323 OnAlerting is invoked */ typedef void (*chan_ringing_cb)(unsigned); -chan_ringing_cb on_chan_ringing; +extern chan_ringing_cb on_chan_ringing; /* This is a callback protoype function, called when the openh323 OnConnectionEstablished is inovked */ typedef void (*con_established_cb)(unsigned); -con_established_cb on_connection_established; +extern con_established_cb on_connection_established; /* This is a callback prototype function, called when the openH323 OnConnectionCleared callback is invoked */ typedef void (*clear_con_cb)(call_details_t); -clear_con_cb on_connection_cleared; +extern clear_con_cb on_connection_cleared; typedef int (*answer_call_cb)(unsigned); -answer_call_cb on_answer_call; +extern answer_call_cb on_answer_call; /* debug flag */ -int h323debug; +extern int h323debug; #define H323_DTMF_RFC2833 (1 << 0) #define H323_DTMF_INBAND (1 << 1) Index: codecs/gsm/inc/config.h =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/gsm/inc/config.h,v retrieving revision 1.18 diff -u -r1.18 config.h --- codecs/gsm/inc/config.h 19 Aug 2003 18:54:56 -0000 1.18 +++ codecs/gsm/inc/config.h 25 Jun 2004 02:41:14 -0000 @@ -9,29 +9,43 @@ #ifndef CONFIG_H #define CONFIG_H -/*efine SIGHANDLER_T int /* signal handlers are void */ -/*efine HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */ +#if 0 +efine SIGHANDLER_T int /* signal handlers are void */ +efine HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */ +#endif #define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */ -/*efine HAS_LIMITS_H 1 /* /usr/include/limits.h */ +#if 0 +efine HAS_LIMITS_H 1 /* /usr/include/limits.h */ +#endif #define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */ -/*efine HAS_ERRNO_DECL 1 /* errno.h declares errno */ +#if 0 +efine HAS_ERRNO_DECL 1 /* errno.h declares errno */ +#endif #define HAS_FSTAT 1 /* fstat syscall */ #define HAS_FCHMOD 1 /* fchmod syscall */ #define HAS_CHMOD 1 /* chmod syscall */ #define HAS_FCHOWN 1 /* fchown syscall */ #define HAS_CHOWN 1 /* chown syscall */ -/*efine HAS__FSETMODE 1 /* _fsetmode -- set file mode */ +#if 0 +efine HAS__FSETMODE 1 /* _fsetmode -- set file mode */ +#endif #define HAS_STRING_H 1 /* /usr/include/string.h */ -/*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */ +#if 0 +efine HAS_STRINGS_H 1 /* /usr/include/strings.h */ +#endif #define HAS_UNISTD_H 1 /* /usr/include/unistd.h */ #define HAS_UTIME 1 /* POSIX utime(path, times) */ -/*efine HAS_UTIMES 1 /* use utimes() syscall instead */ +#if 0 +efine HAS_UTIMES 1 /* use utimes() syscall instead */ +#endif #define HAS_UTIME_H 1 /* UTIME header file */ -/*efine HAS_UTIMBUF 1 /* struct utimbuf */ -/*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */ +#if 0 +efine HAS_UTIMBUF 1 /* struct utimbuf */ +efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */ +#endif #endif /* CONFIG_H */ Index: =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/analys.c,v retrieving revision 1.15 diff -u -r1.15 analys.c --- codecs/lpc10/analys.c 19 Sep 2003 01:20:22 -0000 1.15 +++ codecs/lpc10/analys.c 25 Jun 2004 02:41:15 -0000 @@ -27,6 +27,8 @@ */ +#include "f2c.h" + #ifdef P_R_O_T_O_T_Y_P_E_S extern int analys_(real *speech, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_encoder_state *st); /* comlen contrl_ 12 */ @@ -55,8 +57,6 @@ -lf2c -lm (in that order) */ -#include "f2c.h" - /* Common Block Declarations */ extern struct { @@ -234,13 +234,7 @@ extern /* Subroutine */ int onset_(real *, integer *, integer *, integer * , integer *, integer *, integer *, struct lpc10_encoder_state *); integer *osptr; - extern /* Subroutine */ void placea_(integer *, integer * - , integer *, integer *, integer *, integer *, integer *, integer * - , integer *); - extern void dcbias_(integer *, real *, real *); - extern void placev_(integer - *, integer *, integer *, integer *, integer *, integer *, integer - *, integer *, integer *, integer *, integer *); + extern int dcbias_(integer *, real *, real *); integer ipitch; integer *obound; extern /* Subroutine */ int preemp_(real *, real *, integer *, real *, Index: codecs/lpc10/bsynz.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/bsynz.c,v retrieving revision 1.14 diff -u -r1.14 bsynz.c --- codecs/lpc10/bsynz.c 12 Feb 2003 13:59:14 -0000 1.14 +++ codecs/lpc10/bsynz.c 25 Jun 2004 02:41:16 -0000 @@ -24,12 +24,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int bsynz_(real *coef, integer *ip, integer *iv, real *sout, real *rms, real *ratio, real *g2pass, struct lpc10_decoder_state *st); -/* comlen contrl_ 12 */ -/*:ref: random_ 4 0 */ -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -37,6 +31,12 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int bsynz_(real *coef, integer *ip, integer *iv, real *sout, real *rms, real *ratio, real *g2pass, struct lpc10_decoder_state *st); +/* comlen contrl_ 12 */ +/*:ref: random_ 4 0 */ +#endif + /* Common Block Declarations */ extern struct { Index: codecs/lpc10/chanwr.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/chanwr.c,v retrieving revision 1.14 diff -u -r1.14 chanwr.c --- codecs/lpc10/chanwr.c 12 Feb 2003 13:59:14 -0000 1.14 +++ codecs/lpc10/chanwr.c 25 Jun 2004 02:41:16 -0000 @@ -21,11 +21,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int chanwr_(integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits, struct lpc10_encoder_state *st); -extern int chanrd_(integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) Index: codecs/lpc10/dcbias.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/dcbias.c,v retrieving revision 1.14 diff -u -r1.14 dcbias.c --- codecs/lpc10/dcbias.c 12 Feb 2003 13:59:14 -0000 1.14 +++ codecs/lpc10/dcbias.c 25 Jun 2004 02:41:16 -0000 @@ -16,10 +16,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int dcbias_(integer *len, real *speech, real *sigout); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -27,6 +23,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int dcbias_(integer *len, real *speech, real *sigout); +#endif + /* ********************************************************************* */ /* DCBIAS Version 50 */ Index: codecs/lpc10/decode.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/decode.c,v retrieving revision 1.15 diff -u -r1.15 decode.c --- codecs/lpc10/decode.c 19 Sep 2003 01:20:22 -0000 1.15 +++ codecs/lpc10/decode.c 25 Jun 2004 02:41:17 -0000 @@ -27,13 +27,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_decoder_state *st); -/* comlen contrl_ 12 */ -/*:ref: ham84_ 14 3 4 4 4 */ -/*:ref: median_ 4 3 4 4 4 */ -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -41,6 +34,13 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_decoder_state *st); +/* comlen contrl_ 12 */ +/*:ref: ham84_ 14 3 4 4 4 */ +/*:ref: median_ 4 3 4 4 4 */ +#endif + /* Common Block Declarations */ extern struct { Index: codecs/lpc10/deemp.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/deemp.c,v retrieving revision 1.14 diff -u -r1.14 deemp.c --- codecs/lpc10/deemp.c 12 Feb 2003 13:59:14 -0000 1.14 +++ codecs/lpc10/deemp.c 25 Jun 2004 02:41:17 -0000 @@ -24,10 +24,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int deemp_(real *x, integer *n, struct lpc10_decoder_state *st); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -35,6 +31,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int deemp_(real *x, integer *n, struct lpc10_decoder_state *st); +#endif + /* ***************************************************************** */ /* DEEMP Version 48 */ Index: codecs/lpc10/difmag.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/difmag.c,v retrieving revision 1.14 diff -u -r1.14 difmag.c --- codecs/lpc10/difmag.c 12 Feb 2003 13:59:14 -0000 1.14 +++ codecs/lpc10/difmag.c 25 Jun 2004 02:41:17 -0000 @@ -16,10 +16,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau, integer *maxlag, real *amdf, integer *minptr, integer *maxptr); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -27,6 +23,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau, integer *maxlag, real *amdf, integer *minptr, integer *maxptr); +#endif + /* ********************************************************************** */ /* DIFMAG Version 49 */ Index: codecs/lpc10/dyptrk.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/dyptrk.c,v retrieving revision 1.14 diff -u -r1.14 dyptrk.c --- codecs/lpc10/dyptrk.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/dyptrk.c 25 Jun 2004 02:41:17 -0000 @@ -24,11 +24,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int dyptrk_(real *amdf, integer *ltau, integer *minptr, integer *voice, integer *pitch, integer *midx, struct lpc10_encoder_state *st); -/* comlen contrl_ 12 */ -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -36,6 +31,11 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int dyptrk_(real *amdf, integer *ltau, integer *minptr, integer *voice, integer *pitch, integer *midx, struct lpc10_encoder_state *st); +/* comlen contrl_ 12 */ +#endif + /* Common Block Declarations */ extern struct { Index: codecs/lpc10/encode.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/encode.c,v retrieving revision 1.14 diff -u -r1.14 encode.c --- codecs/lpc10/encode.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/encode.c 25 Jun 2004 02:41:17 -0000 @@ -16,11 +16,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int encode_(integer *voice, integer *pitch, real *rms, real *rc, integer *ipitch, integer *irms, integer *irc); -/* comlen contrl_ 12 */ -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -28,6 +23,11 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int encode_(integer *voice, integer *pitch, real *rms, real *rc, integer *ipitch, integer *irms, integer *irc); +/* comlen contrl_ 12 */ +#endif + /* Common Block Declarations */ extern struct { Index: codecs/lpc10/energy.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/energy.c,v retrieving revision 1.14 diff -u -r1.14 energy.c --- codecs/lpc10/energy.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/energy.c 25 Jun 2004 02:41:17 -0000 @@ -16,10 +16,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int energy_(integer *len, real *speech, real *rms); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -27,6 +23,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int energy_(integer *len, real *speech, real *rms); +#endif + /* ********************************************************************* */ /* ENERGY Version 50 */ Index: codecs/lpc10/f2c.h =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/f2c.h,v retrieving revision 1.14 diff -u -r1.14 f2c.h --- codecs/lpc10/f2c.h 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/f2c.h 25 Jun 2004 02:41:18 -0000 @@ -212,17 +212,17 @@ typedef /* Character */ VOID (*H_fp)(...); typedef /* Subroutine */ int (*S_fp)(...); #else -typedef int /* Unknown procedure type */ (*U_fp)(); -typedef shortint (*J_fp)(); -typedef integer (*I_fp)(); -typedef real (*R_fp)(); -typedef doublereal (*D_fp)(), (*E_fp)(); -typedef /* Complex */ VOID (*C_fp)(); -typedef /* Double Complex */ VOID (*Z_fp)(); -typedef logical (*L_fp)(); -typedef shortlogical (*K_fp)(); -typedef /* Character */ VOID (*H_fp)(); -typedef /* Subroutine */ int (*S_fp)(); +typedef int /* Unknown procedure type */ (*U_fp)(VOID); +typedef shortint (*J_fp)(VOID); +typedef integer (*I_fp)(VOID); +typedef real (*R_fp)(VOID); +typedef doublereal (*D_fp)(VOID), (*E_fp)(VOID); +typedef /* Complex */ VOID (*C_fp)(VOID); +typedef /* Double Complex */ VOID (*Z_fp)(VOID); +typedef logical (*L_fp)(VOID); +typedef shortlogical (*K_fp)(VOID); +typedef /* Character */ VOID (*H_fp)(VOID); +typedef /* Subroutine */ int (*S_fp)(VOID); #endif /* E_fp is for real functions when -R is not specified */ typedef VOID C_f; /* complex function */ @@ -252,4 +252,71 @@ #undef unix #undef vax #endif + +#ifdef KR_headers +extern integer pow_ii(ap, bp); +extern double r_sign(a,b); +extern integer i_nint(x); +#else +extern integer pow_ii(integer *ap, integer *bp); +extern double r_sign(real *a, real *b); +extern integer i_nint(real *x); + +#endif +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int bsynz_(real *coef, integer *ip, integer *iv, + real *sout, real *rms, real *ratio, real *g2pass, + struct lpc10_decoder_state *st); +extern int chanwr_(integer *order, integer *ipitv, integer *irms, + integer *irc, integer *ibits, struct lpc10_encoder_state *st); +extern int chanrd_(integer *order, integer *ipitv, integer *irms, + integer *irc, integer *ibits); +extern int chanwr_0_(int n__, integer *order, integer *ipitv, + integer *irms, integer *irc, integer *ibits, + struct lpc10_encoder_state *st); +extern int dcbias_(integer *len, real *speech, real *sigout); +extern int decode_(integer *ipitv, integer *irms, integer *irc, + integer *voice, integer *pitch, real *rms, + real *rc, struct lpc10_decoder_state *st); +extern int deemp_(real *x, integer *n, struct lpc10_decoder_state *st); +extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau, + integer *maxlag, real *amdf, integer *minptr, integer *maxptr); +extern int dyptrk_(real *amdf, integer *ltau, integer * + minptr, integer *voice, integer *pitch, integer *midx, + struct lpc10_encoder_state *st); +extern int encode_(integer *voice, integer *pitch, real *rms, real *rc, + integer *ipitch, integer *irms, integer *irc); +extern int energy_(integer *len, real *speech, real *rms); +extern int ham84_(integer *input, integer *output, integer *errcnt); +extern int hp100_(real *speech, integer *start, integer *end, + struct lpc10_encoder_state *st); +extern int inithp100_(void); +extern int invert_(integer *order, real *phi, real *psi, real *rc); +extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pass); +extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real *ivrc); +extern int lpcdec_(integer *bits, real *speech); +extern int initlpcdec_(void); +extern int lpcenc_(real *speech, integer *bits); +extern int initlpcenc_(void); +extern int lpfilt_(real *inbuf, real *lpbuf, integer *len, integer *nsamp); +extern integer median_(integer *d1, integer *d2, integer *d3); +extern int mload_(integer *order, integer *awins, integer *awinf, real *speech, real *phi, real *psi); +extern int onset_(real *pebuf, integer *osbuf, integer *osptr, integer *oslen, integer *sbufl, integer *sbufh, integer *lframe, struct lpc10_encoder_state *st); +extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, real *rc, integer *lframe, integer *ivuv, integer *ipiti, real *rmsi, real *rci, integer *nout, real *ratio, struct lpc10_decoder_state *st); +extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *af, integer *vwin, integer *awin, integer *ewin, integer *lframe, integer *maxwin); +extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obound, integer *vwin, integer *af, integer *lframe, integer *minwin, integer *maxwin, integer *dvwinl, integer *dvwinh); +extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z__); +extern int prepro_(real *speech, integer *length, + struct lpc10_encoder_state *st); +extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_decoder_state *st); +extern integer random_(struct lpc10_decoder_state *st); +extern int rcchk_(integer *order, real *rc1f, real *rc2f); +extern int synths_(integer *voice, integer *pitch, real *rms, real *rc, real *speech, integer *k, struct lpc10_decoder_state *st); +extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real *amdf, integer *minptr, integer *maxptr, integer *mintau); +extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *minamd, real *maxamd, integer *mintau, real *ivrc, integer *obound, integer *voibuf, integer *af, struct lpc10_encoder_state *st); +extern int vparms_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *dither, integer *mintau, integer *zc, integer *lbe, integer *fbe, real *qs, real *rc1, real *ar_b__, real *ar_f__); + #endif + + +#endif /* ! defined F2C_INCLUDE */ Index: codecs/lpc10/ham84.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/ham84.c,v retrieving revision 1.14 diff -u -r1.14 ham84.c --- codecs/lpc10/ham84.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/ham84.c 25 Jun 2004 02:41:18 -0000 @@ -16,10 +16,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int ham84_(integer *input, integer *output, integer *errcnt); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -27,6 +23,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int ham84_(integer *input, integer *output, integer *errcnt); +#endif + /* ***************************************************************** */ /* HAM84 Version 45G */ Index: codecs/lpc10/hp100.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/hp100.c,v retrieving revision 1.14 diff -u -r1.14 hp100.c --- codecs/lpc10/hp100.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/hp100.c 25 Jun 2004 02:41:18 -0000 @@ -24,12 +24,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int hp100_(real *speech, integer *start, integer *end, - struct lpc10_encoder_state *st); -extern int inithp100_(void); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -37,6 +31,12 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int hp100_(real *speech, integer *start, integer *end, + struct lpc10_encoder_state *st); +extern int inithp100_(void); +#endif + /* ********************************************************************* */ /* HP100 Version 55 */ Index: codecs/lpc10/invert.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/invert.c,v retrieving revision 1.14 diff -u -r1.14 invert.c --- codecs/lpc10/invert.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/invert.c 25 Jun 2004 02:41:18 -0000 @@ -16,10 +16,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int invert_(integer *order, real *phi, real *psi, real *rc); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -27,6 +23,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int invert_(integer *order, real *phi, real *psi, real *rc); +#endif + /* **************************************************************** */ /* INVERT Version 45G */ Index: codecs/lpc10/irc2pc.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/irc2pc.c,v retrieving revision 1.14 diff -u -r1.14 irc2pc.c --- codecs/lpc10/irc2pc.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/irc2pc.c 25 Jun 2004 02:41:18 -0000 @@ -16,10 +16,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pass); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -27,6 +23,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pass); +#endif + /* ***************************************************************** */ /* IRC2PC Version 48 */ Index: codecs/lpc10/ivfilt.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/ivfilt.c,v retrieving revision 1.15 diff -u -r1.15 ivfilt.c --- codecs/lpc10/ivfilt.c 19 Sep 2003 01:20:22 -0000 1.15 +++ codecs/lpc10/ivfilt.c 25 Jun 2004 02:41:18 -0000 @@ -19,10 +19,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real *ivrc); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -30,6 +26,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real *ivrc); +#endif + /* ********************************************************************* */ /* IVFILT Version 48 */ Index: codecs/lpc10/lpcdec.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/lpcdec.c,v retrieving revision 1.14 diff -u -r1.14 lpcdec.c --- codecs/lpc10/lpcdec.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/lpcdec.c 25 Jun 2004 02:41:18 -0000 @@ -27,6 +27,13 @@ */ +/* -- translated by f2c (version 19951025). + You must link the resulting object file with the libraries: + -lf2c -lm (in that order) +*/ + +#include "f2c.h" + #ifdef P_R_O_T_O_T_Y_P_E_S extern int lpcdec_(integer *bits, real *speech); extern int initlpcdec_(void); @@ -38,13 +45,6 @@ /*:ref: initsynths_ 14 0 */ #endif -/* -- translated by f2c (version 19951025). - You must link the resulting object file with the libraries: - -lf2c -lm (in that order) -*/ - -#include "f2c.h" - /* Common Block Declarations */ extern struct { Index: codecs/lpc10/lpcenc.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/lpcenc.c,v retrieving revision 1.14 diff -u -r1.14 lpcenc.c --- codecs/lpc10/lpcenc.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/lpcenc.c 25 Jun 2004 02:41:18 -0000 @@ -27,6 +27,13 @@ */ +/* -- translated by f2c (version 19951025). + You must link the resulting object file with the libraries: + -lf2c -lm (in that order) +*/ + +#include "f2c.h" + #ifdef P_R_O_T_O_T_Y_P_E_S extern int lpcenc_(real *speech, integer *bits); extern int initlpcenc_(void); @@ -38,13 +45,6 @@ /*:ref: initanalys_ 14 0 */ #endif -/* -- translated by f2c (version 19951025). - You must link the resulting object file with the libraries: - -lf2c -lm (in that order) -*/ - -#include "f2c.h" - /* Table of constant values */ static integer c__180 = 180; Index: codecs/lpc10/lpfilt.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/lpfilt.c,v retrieving revision 1.14 diff -u -r1.14 lpfilt.c --- codecs/lpc10/lpfilt.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/lpfilt.c 25 Jun 2004 02:41:19 -0000 @@ -16,10 +16,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int lpfilt_(real *inbuf, real *lpbuf, integer *len, integer *nsamp); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -27,6 +23,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int lpfilt_(real *inbuf, real *lpbuf, integer *len, integer *nsamp); +#endif + /* *********************************************************************** */ /* LPFILT Version 55 */ Index: codecs/lpc10/median.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/median.c,v retrieving revision 1.14 diff -u -r1.14 median.c --- codecs/lpc10/median.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/median.c 25 Jun 2004 02:41:19 -0000 @@ -16,10 +16,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern integer median_(integer *d1, integer *d2, integer *d3); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -27,6 +23,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern integer median_(integer *d1, integer *d2, integer *d3); +#endif + /* ********************************************************************* */ /* MEDIAN Version 45G */ Index: codecs/lpc10/mload.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/mload.c,v retrieving revision 1.14 diff -u -r1.14 mload.c --- codecs/lpc10/mload.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/mload.c 25 Jun 2004 02:41:19 -0000 @@ -16,10 +16,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int mload_(integer *order, integer *awins, integer *awinf, real *speech, real *phi, real *psi); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -27,6 +23,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int mload_(integer *order, integer *awins, integer *awinf, real *speech, real *phi, real *psi); +#endif + /* ***************************************************************** */ /* MLOAD Version 48 */ Index: codecs/lpc10/onset.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/onset.c,v retrieving revision 1.14 diff -u -r1.14 onset.c --- codecs/lpc10/onset.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/onset.c 25 Jun 2004 02:41:19 -0000 @@ -24,10 +24,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int onset_(real *pebuf, integer *osbuf, integer *osptr, integer *oslen, integer *sbufl, integer *sbufh, integer *lframe, struct lpc10_encoder_state *st); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -35,6 +31,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int onset_(real *pebuf, integer *osbuf, integer *osptr, integer *oslen, integer *sbufl, integer *sbufh, integer *lframe, struct lpc10_encoder_state *st); +#endif + /* Table of constant values */ static real c_b2 = 1.f; Index: codecs/lpc10/pitsyn.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/pitsyn.c,v retrieving revision 1.15 diff -u -r1.15 pitsyn.c --- codecs/lpc10/pitsyn.c 23 Nov 2003 22:14:32 -0000 1.15 +++ codecs/lpc10/pitsyn.c 25 Jun 2004 02:41:19 -0000 @@ -27,10 +27,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, real *rc, integer *lframe, integer *ivuv, integer *ipiti, real *rmsi, real *rci, integer *nout, real *ratio, struct lpc10_decoder_state *st); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -38,6 +34,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, real *rc, integer *lframe, integer *ivuv, integer *ipiti, real *rmsi, real *rci, integer *nout, real *ratio, struct lpc10_decoder_state *st); +#endif + /* ***************************************************************** */ /* PITSYN Version 53 */ Index: codecs/lpc10/placea.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/placea.c,v retrieving revision 1.15 diff -u -r1.15 placea.c --- codecs/lpc10/placea.c 19 Sep 2003 01:20:22 -0000 1.15 +++ codecs/lpc10/placea.c 25 Jun 2004 02:41:20 -0000 @@ -22,10 +22,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *af, integer *vwin, integer *awin, integer *ewin, integer *lframe, integer *maxwin); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -33,6 +29,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *af, integer *vwin, integer *awin, integer *ewin, integer *lframe, integer *maxwin); +#endif + /* *********************************************************************** */ /* PLACEA Version 48 */ Index: codecs/lpc10/placev.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/placev.c,v retrieving revision 1.14 diff -u -r1.14 placev.c --- codecs/lpc10/placev.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/placev.c 25 Jun 2004 02:41:20 -0000 @@ -19,10 +19,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obound, integer *vwin, integer *af, integer *lframe, integer *minwin, integer *maxwin, integer *dvwinl, integer *dvwinh); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -30,6 +26,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obound, integer *vwin, integer *af, integer *lframe, integer *minwin, integer *maxwin, integer *dvwinl, integer *dvwinh); +#endif + /* ****************************************************************** */ /* PLACEV Version 48 */ Index: codecs/lpc10/preemp.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/preemp.c,v retrieving revision 1.14 diff -u -r1.14 preemp.c --- codecs/lpc10/preemp.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/preemp.c 25 Jun 2004 02:41:20 -0000 @@ -16,10 +16,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z__); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -27,6 +23,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z__); +#endif + /* ******************************************************************* */ /* PREEMP Version 55 */ Index: codecs/lpc10/prepro.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/prepro.c,v retrieving revision 1.14 diff -u -r1.14 prepro.c --- codecs/lpc10/prepro.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/prepro.c 25 Jun 2004 02:41:20 -0000 @@ -21,23 +21,22 @@ * Revision 1.1 1996/08/19 22:30:54 jaf * Initial revision * + */ +/* -- translated by f2c (version 19951025). + You must link the resulting object file with the libraries: + -lf2c -lm (in that order) */ +#include "f2c.h" + #ifdef P_R_O_T_O_T_Y_P_E_S extern int prepro_(real *speech, integer *length, - struct lpc10_encoder_state *st) + struct lpc10_encoder_state *st); /*:ref: hp100_ 14 3 6 4 4 */ /*:ref: inithp100_ 14 0 */ #endif -/* -- translated by f2c (version 19951025). - You must link the resulting object file with the libraries: - -lf2c -lm (in that order) -*/ - -#include "f2c.h" - /* Table of constant values */ static integer c__1 = 1; Index: codecs/lpc10/random.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/random.c,v retrieving revision 1.14 diff -u -r1.14 random.c --- codecs/lpc10/random.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/random.c 25 Jun 2004 02:41:20 -0000 @@ -24,10 +24,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern integer random_(struct lpc10_decoder_state *st); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -35,6 +31,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern integer random_(struct lpc10_decoder_state *st); +#endif + /* ********************************************************************** */ /* RANDOM Version 49 */ Index: codecs/lpc10/rcchk.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/rcchk.c,v retrieving revision 1.14 diff -u -r1.14 rcchk.c --- codecs/lpc10/rcchk.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/rcchk.c 25 Jun 2004 02:41:20 -0000 @@ -16,10 +16,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int rcchk_(integer *order, real *rc1f, real *rc2f); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -27,6 +23,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int rcchk_(integer *order, real *rc1f, real *rc2f); +#endif + /* ********************************************************************* */ /* RCCHK Version 45G */ Index: codecs/lpc10/synths.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/synths.c,v retrieving revision 1.15 diff -u -r1.15 synths.c --- codecs/lpc10/synths.c 27 Sep 2003 02:45:37 -0000 1.15 +++ codecs/lpc10/synths.c 25 Jun 2004 02:41:21 -0000 @@ -27,6 +27,13 @@ */ +/* -- translated by f2c (version 19951025). + You must link the resulting object file with the libraries: + -lf2c -lm (in that order) +*/ + +#include "f2c.h" + #ifdef P_R_O_T_O_T_Y_P_E_S extern int synths_(integer *voice, integer *pitch, real *rms, real *rc, real *speech, integer *k, struct lpc10_decoder_state *st); /* comlen contrl_ 12 */ @@ -39,13 +46,6 @@ /*:ref: initdeemp_ 14 0 */ #endif -/* -- translated by f2c (version 19951025). - You must link the resulting object file with the libraries: - -lf2c -lm (in that order) -*/ - -#include "f2c.h" - /* Common Block Declarations */ extern struct { @@ -179,9 +179,6 @@ extern /* Subroutine */ int deemp_(real *, integer *, struct lpc10_decoder_state *); real ratio; integer ipiti[16]; - extern /* Subroutine */ void bsynz_(real *, integer *, - integer *, real *, real *, real *, real *, struct lpc10_decoder_state *), irc2pc_(real *, real * - , integer *, real *, real *); real g2pass; real pc[10]; extern /* Subroutine */ int pitsyn_(integer *, integer *, integer *, real Index: codecs/lpc10/tbdm.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/tbdm.c,v retrieving revision 1.14 diff -u -r1.14 tbdm.c --- codecs/lpc10/tbdm.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/tbdm.c 25 Jun 2004 02:41:21 -0000 @@ -16,11 +16,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real *amdf, integer *minptr, integer *maxptr, integer *mintau); -/*:ref: difmag_ 14 8 6 4 4 4 4 6 4 4 */ -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -28,6 +23,11 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real *amdf, integer *minptr, integer *maxptr, integer *mintau); +/*:ref: difmag_ 14 8 6 4 4 4 4 6 4 4 */ +#endif + /* ********************************************************************** */ /* TBDM Version 49 */ Index: codecs/lpc10/voicin.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/voicin.c,v retrieving revision 1.15 diff -u -r1.15 voicin.c --- codecs/lpc10/voicin.c 23 Nov 2003 22:14:32 -0000 1.15 +++ codecs/lpc10/voicin.c 25 Jun 2004 02:41:21 -0000 @@ -27,12 +27,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *minamd, real *maxamd, integer *mintau, real *ivrc, integer *obound, integer *voibuf, integer *af, struct lpc10_encoder_state *st); -/* comlen contrl_ 12 */ -/*:ref: vparms_ 14 14 4 6 6 4 4 6 4 4 4 4 6 6 6 6 */ -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -40,6 +34,12 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *minamd, real *maxamd, integer *mintau, real *ivrc, integer *obound, integer *voibuf, integer *af, struct lpc10_encoder_state *st); +/* comlen contrl_ 12 */ +/*:ref: vparms_ 14 14 4 6 6 4 4 6 4 4 4 4 6 6 6 6 */ +#endif + /* Common Block Declarations */ extern struct { Index: codecs/lpc10/vparms.c =================================================================== RCS file: /usr/cvsroot/asterisk/codecs/lpc10/vparms.c,v retrieving revision 1.14 diff -u -r1.14 vparms.c --- codecs/lpc10/vparms.c 12 Feb 2003 13:59:15 -0000 1.14 +++ codecs/lpc10/vparms.c 25 Jun 2004 02:41:22 -0000 @@ -16,10 +16,6 @@ */ -#ifdef P_R_O_T_O_T_Y_P_E_S -extern int vparms_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *dither, integer *mintau, integer *zc, integer *lbe, integer *fbe, real *qs, real *rc1, real *ar_b__, real *ar_f__); -#endif - /* -- translated by f2c (version 19951025). You must link the resulting object file with the libraries: -lf2c -lm (in that order) @@ -27,6 +23,10 @@ #include "f2c.h" +#ifdef P_R_O_T_O_T_Y_P_E_S +extern int vparms_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *dither, integer *mintau, integer *zc, integer *lbe, integer *fbe, real *qs, real *rc1, real *ar_b__, real *ar_f__); +#endif + /* Table of constant values */ static real c_b2 = 1.f;