Merge source cleanups (bug #1911)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3311 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/ast_expr.y b/ast_expr.y
index 5125ec56332a83b66e020e5165f08232799cda0e..97b2b021cfaff041189ee1bb351c6c38eb97019c 100755 (executable)
--- a/ast_expr.y
+++ b/ast_expr.y
@@ -20,6 +20,13 @@
 #include <asterisk/ast_expr.h>
 #include <asterisk/logger.h>
 
+#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

diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 4eb451e19cb844004ca65aa76e7cf02a2e1afd53..1cc14e06df02b892cde809cfbc2d74b739151528 100755 (executable)
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -78,6 +78,7 @@ static char digits[80] = "";
 static char text2send[80] = "";
 
 AST_MUTEX_DEFINE_STATIC(usecnt_lock);
+AST_MUTEX_DEFINE_STATIC(alsalock);
 
 static char *type = "Console";
 static char *desc = "ALSA Console Channel Driver";
@@ -330,7 +331,9 @@ static snd_pcm_t *alsa_card_init(char *dev, snd_pcm_stream_t stream)
        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;
 

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index a2e88662cd1230ba91691ab88bd7e83ca9d0bda0..879ab6d474321945fcd44ef1852b642ca21dcd22 100755 (executable)
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -27,8 +27,29 @@
  */
 
 
+#include <sys/socket.h>
+#include <sys/signal.h>
+#include <sys/param.h>
+#if defined(BSD)
+#ifndef IPTOS_MINCOST
+#define IPTOS_MINCOST 0x02
+#endif
+#endif
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <netdb.h>
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#ifdef __cplusplus
+extern "C" {
+#endif   
 #include <asterisk/lock.h>
 #include <asterisk/logger.h>
 #include <asterisk/channel.h>
@@ -46,25 +67,23 @@
 #include <asterisk/callerid.h>
 #include <asterisk/cli.h>
 #include <asterisk/dsp.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <sys/signal.h>
-#include <sys/param.h>
-#if defined(BSD)
-#include <netinet/in_systm.h>
-#ifndef IPTOS_MINCOST
-#define IPTOS_MINCOST 0x02
-#endif
+#ifdef __cplusplus
+}
 #endif
-#include <netinet/ip.h>
-
 #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 @@ static struct oh323_peer *build_peer(char *name, struct ast_variable *v)
                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 struct oh323_peer *build_peer(char *name, struct ast_variable *v)
  */
 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_digit(struct ast_channel *c, char digit)
 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 @@ static int oh323_answer(struct ast_channel *c)
 {
        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_answer(struct ast_channel *c)
 
 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 @@ static int oh323_hangup(struct ast_channel *c)
        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_rtp_read(struct oh323_pvt *p)
 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 struct ast_frame  *oh323_read(struct ast_channel *c)
 
 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_write(struct ast_channel *c, struct ast_frame *frame)
 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 @@ static int oh323_indicate(struct ast_channel *c, int condition)
 // 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 @@ static struct oh323_pvt *oh323_alloc(int callid)
 {
        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 @@ static struct oh323_pvt *find_call(int call_reference)
         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 @@ static struct ast_channel *oh323_request(char *type, int format, void *data)
        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 rtp_info *create_connection(unsigned call_reference)
        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 @@ int reload(void)
 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 @@ static int oh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, str
                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;

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 0d60b963a4b49135dcc9f73d9ab31b04b7ed897b..cb48f014499a41fb13f86c708b348253190d3dc1 100755 (executable)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -2722,7 +2722,7 @@ static unsigned int calc_rxstamp(struct chan_iax2_pvt *p)
        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 */

diff --git a/channels/h323/ast_h323.cpp b/channels/h323/ast_h323.cpp
index e1d396999d47a7fc79ba4eed2bac80dd53102953..ad86358c22b029bf8fbf1372956c3c619f43735c 100755 (executable)
--- a/channels/h323/ast_h323.cpp
+++ b/channels/h323/ast_h323.cpp
@@ -25,9 +25,28 @@
  *
  * Version Info: $Id$
  */
+#include <arpa/inet.h>
+
+#include <list>
+#include <string>
+#include <algorithm>
+
+#include <ptlib.h>
+#include <h323.h>
+#include <h323pdu.h>
+#include <mediafmt.h>
+#include <lid.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif   
 #include <asterisk/logger.h>
-#include "ast_h323.h"
+#ifdef __cplusplus
+}
+#endif
 
+#include "chan_h323.h"
+#include "ast_h323.h"
 
 /* PWlib Required Components  */
 #define MAJOR_VERSION 1

diff --git a/channels/h323/ast_h323.h b/channels/h323/ast_h323.h
index ab30c4435149b192fddff2e8843b373e262fd9ed..5d50b58fb9beb7e8a1248028de430a9223a4ffa3 100755 (executable)
--- a/channels/h323/ast_h323.h
+++ b/channels/h323/ast_h323.h
@@ -26,18 +26,8 @@
  * Version Info: $Id$ 
  */
 
-
-#include <ptlib.h>
-#include <h323.h>
-#include <h323pdu.h>
-#include <mediafmt.h>
-#include <lid.h>
-
-#include <list>
-#include <string>
-#include <algorithm>
-
-#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 @@ class MyProcess : public PProcess {
        
 };
 
+#endif /* !defined AST_H323_H */

diff --git a/channels/h323/chan_h323.h b/channels/h323/chan_h323.h
index 23e583f8976bcdf49b5a7eef853c75fc6d4756b8..e45d3c4dc242cf0ae06b30965c3f0934b8c83049 100755 (executable)
--- a/channels/h323/chan_h323.h
+++ b/channels/h323/chan_h323.h
@@ -116,48 +116,48 @@ typedef struct rtp_info {
 /* 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)

diff --git a/codecs/gsm/inc/config.h b/codecs/gsm/inc/config.h
index ef1bfcdaed05f3ce4fdc2b738d00bfa95f17742d..e0b0632be308c0666a2d7f3b4a5cc0830ec05e7c 100755 (executable)
--- a/codecs/gsm/inc/config.h
+++ b/codecs/gsm/inc/config.h
@@ -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 */

diff --git a/codecs/lpc10/analys.c b/codecs/lpc10/analys.c
index 3ebaed7bb7abb383f36f7869fcf5ec8cc3004a24..3fa21f22b8b51db355d677a8174149a9fdfa3ceb 100755 (executable)
--- a/codecs/lpc10/analys.c
+++ b/codecs/lpc10/analys.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.16  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.15  2003/09/19 01:20:22  markster
 Code cleanups (bug #66)
 
@@ -27,6 +30,8 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#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 +60,6 @@ extern int analys_(real *speech, integer *voice, integer *pitch, real *rms, real
        -lf2c -lm   (in that order)
 */
 
-#include "f2c.h"
-
 /* Common Block Declarations */
 
 extern struct {
@@ -85,9 +88,12 @@ static integer c__1 = 1;
 /*     ANALYS Version 55 */
 
 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*
@@ -234,13 +240,7 @@ static integer c__1 = 1;
     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 *, 
@@ -260,9 +260,12 @@ static integer c__1 = 1;
     real phi[100]      /* was [10][10] */, psi[10];
 
 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*
@@ -297,9 +300,12 @@ static integer c__1 = 1;
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments to ANALYS */
 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*

diff --git a/codecs/lpc10/bsynz.c b/codecs/lpc10/bsynz.c
index 6c15ebb624042b4e76de105a07a8bf54ee4685aa..5971a1a223241ae1043445878c6cc1ff4bd623a3 100755 (executable)
--- a/codecs/lpc10/bsynz.c
+++ b/codecs/lpc10/bsynz.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:14  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -24,12 +27,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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 +34,12 @@ extern int bsynz_(real *coef, integer *ip, integer *iv, real *sout, real *rms, r
 
 #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 {
@@ -51,9 +54,12 @@ extern struct {
 /*     BSYNZ Version 54 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:14  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:14  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -150,9 +156,12 @@ extern struct {
     real lpi0, hpi0;
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:14  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:14  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -184,9 +193,12 @@ extern struct {
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:14  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:14  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/chanwr.c b/codecs/lpc10/chanwr.c
index 5b600822fd562020c946d75198e38741619865e9..f35efd1794c77b70c2ca896d0adf23bdad7c3e45 100755 (executable)
--- a/codecs/lpc10/chanwr.c
+++ b/codecs/lpc10/chanwr.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:14  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -21,11 +24,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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)
@@ -38,9 +36,12 @@ extern int chanrd_(integer *order, integer *ipitv, integer *irms, integer *irc,
 /*     CHANL Version 49 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:14  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:14  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/dcbias.c b/codecs/lpc10/dcbias.c
index b34480a4e54b5bbd0ee0718002889a412a430c38..62d774428e777c2f892019e6d401d2b56eb69d93 100755 (executable)
--- a/codecs/lpc10/dcbias.c
+++ b/codecs/lpc10/dcbias.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:14  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +26,21 @@ extern int dcbias_(integer *len, real *speech, real *sigout);
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:14  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:14  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/decode.c b/codecs/lpc10/decode.c
index 6d129b360db67a4d4a59dd121f60941a06bf20b9..8a16616479d44cbf0daf2d8e7c63e2a0b673080c 100755 (executable)
--- a/codecs/lpc10/decode.c
+++ b/codecs/lpc10/decode.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.16  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.15  2003/09/19 01:20:22  markster
 Code cleanups (bug #66)
 
@@ -27,13 +30,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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 +37,13 @@ extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice,
 
 #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 {
@@ -59,9 +62,12 @@ static integer c__2 = 2;
 /*     DECODE Version 54 */
 
 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*
@@ -200,9 +206,12 @@ static integer c__2 = 2;
     integer ishift, errcnt, lsb;
 
 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*
@@ -237,9 +246,12 @@ static integer c__2 = 2;
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*

diff --git a/codecs/lpc10/deemp.c b/codecs/lpc10/deemp.c
index a79d84adc99a1bb2d5bff6a00efb786147e8b665..067bd11374d5f18afe695c7366dba6f746520ce2 100755 (executable)
--- a/codecs/lpc10/deemp.c
+++ b/codecs/lpc10/deemp.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:14  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -24,10 +27,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +34,21 @@ extern int deemp_(real *x, integer *n, struct lpc10_decoder_state *st);
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:14  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:14  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/difmag.c b/codecs/lpc10/difmag.c
index 734ad9665a67f844cbf9cb2e2eaa1203808b196f..d8d854faea8665535e720f2d24e0dac18d7f0b3d 100755 (executable)
--- a/codecs/lpc10/difmag.c
+++ b/codecs/lpc10/difmag.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:14  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +26,21 @@ extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau, in
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:14  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:14  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/dyptrk.c b/codecs/lpc10/dyptrk.c
index 7a5c136b9967c9e1ad893f2125d5ab4774ac4004..4a4b1a14f7dbb2330d53261c81ece925c760560f 100755 (executable)
--- a/codecs/lpc10/dyptrk.c
+++ b/codecs/lpc10/dyptrk.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -24,11 +27,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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 +34,11 @@ extern int dyptrk_(real *amdf, integer *ltau, integer *minptr, integer *voice, i
 
 #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 {
@@ -50,9 +53,12 @@ extern struct {
 /*     DYPTRK Version 52 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -142,9 +148,12 @@ extern struct {
 
 /*       Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/encode.c b/codecs/lpc10/encode.c
index 81093ac607941228f3b2dada4b6ca610b3738d0e..109a42264c3a26130872a57e590878841a52f98a 100755 (executable)
--- a/codecs/lpc10/encode.c
+++ b/codecs/lpc10/encode.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -16,11 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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 +26,11 @@ extern int encode_(integer *voice, integer *pitch, real *rms, real *rc, integer
 
 #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 {
@@ -46,9 +49,12 @@ static integer c__2 = 2;
 /*     ENCODE Version 54 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -134,9 +140,12 @@ static integer c__2 = 2;
     integer idel, nbit, i__, j, i2, i3, mrk;
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -160,9 +169,12 @@ static integer c__2 = 2;
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/energy.c b/codecs/lpc10/energy.c
index f159dd52acf767934d9666df0e8ecea230f317c0..baa6f57ca5d3de9b0e24bdb17af856a7998e260c 100755 (executable)
--- a/codecs/lpc10/energy.c
+++ b/codecs/lpc10/energy.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +26,21 @@ extern int energy_(integer *len, real *speech, real *rms);
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/f2c.h b/codecs/lpc10/f2c.h
index 7f4bcf2578a5143889371284e08ae3473c403bc0..e50d642e0a36162ffdd55d5ff17e4c8ad85b61c2 100755 (executable)
--- a/codecs/lpc10/f2c.h
+++ b/codecs/lpc10/f2c.h
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -212,17 +215,17 @@ typedef shortlogical (*K_fp)(...);
 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 +255,71 @@ typedef doublereal E_f;    /* real function with -R not specified */
 #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 */

diff --git a/codecs/lpc10/ham84.c b/codecs/lpc10/ham84.c
index c4848b1eee3304f5b8d00bdf87be14bed05cc25a..9281d75d258fc66dd986ae0e1a9dd49f195aeca1 100755 (executable)
--- a/codecs/lpc10/ham84.c
+++ b/codecs/lpc10/ham84.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +26,21 @@ extern int ham84_(integer *input, integer *output, integer *errcnt);
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/hp100.c b/codecs/lpc10/hp100.c
index 7dae73b7ff50c768e38b7961393faed2fc5715e0..7693a47642460998e04e5af7098ed51bb3e04ab0 100755 (executable)
--- a/codecs/lpc10/hp100.c
+++ b/codecs/lpc10/hp100.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -24,12 +27,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +34,23 @@ extern int inithp100_(void);
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/invert.c b/codecs/lpc10/invert.c
index 56045915e97f9d44a25ef01fbb27c50011fd129e..1eb1079ee4adb3659419e11c3f5774450979fd82 100755 (executable)
--- a/codecs/lpc10/invert.c
+++ b/codecs/lpc10/invert.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +26,21 @@ extern int invert_(integer *order, real *phi, real *psi, real *rc);
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -97,9 +103,12 @@ extern int invert_(integer *order, real *phi, real *psi, real *rc);
 
 /*       Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/irc2pc.c b/codecs/lpc10/irc2pc.c
index a178442e60025f628b26b858a84bb7eab4151a6a..412feb72a60eb5b2a3f194b3cce7b22908400ecf 100755 (executable)
--- a/codecs/lpc10/irc2pc.c
+++ b/codecs/lpc10/irc2pc.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +26,21 @@ extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pas
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -88,9 +94,12 @@ extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pas
 
 /*     Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/ivfilt.c b/codecs/lpc10/ivfilt.c
index fc8adcc290bcb3b87a33b087df9dd4c72f57bb9c..f964064e8d880d37bd80384d5a539e94a7ce12a7 100755 (executable)
--- a/codecs/lpc10/ivfilt.c
+++ b/codecs/lpc10/ivfilt.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.16  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.15  2003/09/19 01:20:22  markster
 Code cleanups (bug #66)
 
@@ -19,10 +22,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +29,21 @@ extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real
 
 #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 */
 
 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*

diff --git a/codecs/lpc10/lpcdec.c b/codecs/lpc10/lpcdec.c
index 9929d1fbfe90ef96228622443774ddb518da31d6..39be6e452910561bb88985c2f725dc9d4a824805 100755 (executable)
--- a/codecs/lpc10/lpcdec.c
+++ b/codecs/lpc10/lpcdec.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -27,6 +30,13 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+/*  -- 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 +48,6 @@ extern int initlpcdec_(void);
 /*: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 {
@@ -61,9 +64,12 @@ static integer c__10 = 10;
 /* ***************************************************************** */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -119,9 +125,12 @@ static integer c__10 = 10;
     real rms;
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -156,9 +165,12 @@ static integer c__10 = 10;
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/lpcenc.c b/codecs/lpc10/lpcenc.c
index a3222af9dcaa6a193902062721dbaa06396bcbd8..09924bd9e5e01a8143006db44f2754aaaa1aaeb2 100755 (executable)
--- a/codecs/lpc10/lpcenc.c
+++ b/codecs/lpc10/lpcenc.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -27,6 +30,13 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+/*  -- 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 +48,6 @@ extern int initlpcenc_(void);
 /*: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;
@@ -53,9 +56,12 @@ static integer c__10 = 10;
 /* ***************************************************************** */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -115,9 +121,12 @@ static integer c__10 = 10;
 
 /*       Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/lpfilt.c b/codecs/lpc10/lpfilt.c
index 9dff6b52a6d497b5691b5fd50dad0f887039be94..f83e401554b8ebf0f899c8e45f89690146dec166 100755 (executable)
--- a/codecs/lpc10/lpfilt.c
+++ b/codecs/lpc10/lpfilt.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +26,21 @@ extern int lpfilt_(real *inbuf, real *lpbuf, integer *len, integer *nsamp);
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/median.c b/codecs/lpc10/median.c
index 376c46c4264ea4ee5fab544ef246f3a0c8689c27..ed4e2819d788588bdfed6f67ea4520b0b4fc88c1 100755 (executable)
--- a/codecs/lpc10/median.c
+++ b/codecs/lpc10/median.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +26,21 @@ extern integer median_(integer *d1, integer *d2, integer *d3);
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/mload.c b/codecs/lpc10/mload.c
index 0789cfa43a1accb92afeaabaf38bda61634029e7..749646097e3ee6a48e6d48cedfecef64968760a7 100755 (executable)
--- a/codecs/lpc10/mload.c
+++ b/codecs/lpc10/mload.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +26,21 @@ extern int mload_(integer *order, integer *awins, integer *awinf, real *speech,
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/onset.c b/codecs/lpc10/onset.c
index 1e9c1d0f7503143d69d85cdf28260ad2a8f3df3b..b8037a84d85e89af00b4b37ed600979c8b6ac466 100755 (executable)
--- a/codecs/lpc10/onset.c
+++ b/codecs/lpc10/onset.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -24,10 +27,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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 +34,10 @@ extern int onset_(real *pebuf, integer *osbuf, integer *osptr, integer *oslen, i
 
 #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;
@@ -44,9 +47,12 @@ static real c_b2 = 1.f;
 /*     ONSET Version 49 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -149,9 +155,12 @@ static real c_b2 = 1.f;
 
 /*       Arguments */
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/pitsyn.c b/codecs/lpc10/pitsyn.c
index c027901f69407cd7bfa855167a3dff1d45d040f4..3152ce44b86ff06a018b533ad01e7396978df0b5 100755 (executable)
--- a/codecs/lpc10/pitsyn.c
+++ b/codecs/lpc10/pitsyn.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.16  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.15  2003/11/23 22:14:32  markster
 Various warning cleanups
 
@@ -27,10 +30,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +37,21 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re
 
 #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 */
 
 /* $Log$
- * Revision 1.15  2003/11/23 22:14:32  markster
- * Various warning cleanups
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/11/23 22:14:32  markster
+/* Various warning cleanups
+/*
 /* Revision 1.14  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -155,9 +161,12 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re
 
 /*       Arguments */
 /* $Log$
- * Revision 1.15  2003/11/23 22:14:32  markster
- * Various warning cleanups
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/11/23 22:14:32  markster
+/* Various warning cleanups
+/*
 /* Revision 1.14  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/placea.c b/codecs/lpc10/placea.c
index 3408f29a6d87287f48fb76cb548e2318840404e7..9464fb792266e509fec38adced625a4c776f7f93 100755 (executable)
--- a/codecs/lpc10/placea.c
+++ b/codecs/lpc10/placea.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.16  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.15  2003/09/19 01:20:22  markster
 Code cleanups (bug #66)
 
@@ -22,10 +25,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +32,21 @@ extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *a
 
 #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 */
 
 /* $Log$
- * Revision 1.15  2003/09/19 01:20:22  markster
- * Code cleanups (bug #66)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/09/19 01:20:22  markster
+/* Code cleanups (bug #66)
+/*
 /* Revision 1.2  2003/09/19 01:20:22  markster
 /* Code cleanups (bug #66)
 /*

diff --git a/codecs/lpc10/placev.c b/codecs/lpc10/placev.c
index eae5fcdec1d2355992fd407aa53d2f27f25547d9..a11319cb196334afc56913ff55590e0509cd7c64 100755 (executable)
--- a/codecs/lpc10/placev.c
+++ b/codecs/lpc10/placev.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -19,10 +22,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +29,21 @@ extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obou
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/preemp.c b/codecs/lpc10/preemp.c
index 05fb9fb6d703a0dca26c064cbd1a1b4b7cacda4f..cc27f7baab92b314c453b7b6f11d746d34fc74b9 100755 (executable)
--- a/codecs/lpc10/preemp.c
+++ b/codecs/lpc10/preemp.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +26,21 @@ extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/prepro.c b/codecs/lpc10/prepro.c
index e21b4ca3860116fddba5842cc234d275c5792020..8f3d5380ee6a9d56a19303abef4e60a747a44014 100755 (executable)
--- a/codecs/lpc10/prepro.c
+++ b/codecs/lpc10/prepro.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -21,23 +24,22 @@ Some OSS fixes and a few lpc changes to make it actually work
  * 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;
@@ -47,9 +49,12 @@ static integer c__1 = 1;
 /*     PREPRO Version 48 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/random.c b/codecs/lpc10/random.c
index ec3ef45e7c87fa7d28b2c08a0159c6005b82c77a..ef5876f1544f45b2ef68f4f1cefb243187bec57f 100755 (executable)
--- a/codecs/lpc10/random.c
+++ b/codecs/lpc10/random.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -24,10 +27,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +34,21 @@ extern integer random_(struct lpc10_decoder_state *st);
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/rcchk.c b/codecs/lpc10/rcchk.c
index a2fe86702c9134ae02e633f75992d5fe7e81709d..16fe9b93066f3fc6fccf5fba912ec12aaab0ec49 100755 (executable)
--- a/codecs/lpc10/rcchk.c
+++ b/codecs/lpc10/rcchk.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +26,21 @@ extern int rcchk_(integer *order, real *rc1f, real *rc2f);
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/synths.c b/codecs/lpc10/synths.c
index 369e6d662e83035eeeea002d13ada46a4a8deb89..736d54b65dd8f7b52465d9ac8507b2e098055e6a 100755 (executable)
--- a/codecs/lpc10/synths.c
+++ b/codecs/lpc10/synths.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.16  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.15  2003/09/27 02:45:37  markster
 Fix various compiler warnings (bug #322)
 
@@ -27,6 +30,13 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+/*  -- 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 +49,6 @@ extern int synths_(integer *voice, integer *pitch, real *rms, real *rc, real *sp
 /*: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 {
@@ -64,9 +67,12 @@ static real c_b2 = .7f;
 /*     SYNTHS Version 54 */
 
 /* $Log$
- * Revision 1.15  2003/09/27 02:45:37  markster
- * Fix various compiler warnings (bug #322)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/09/27 02:45:37  markster
+/* Fix various compiler warnings (bug #322)
+/*
 /* Revision 1.2  2003/09/27 02:45:37  markster
 /* Fix various compiler warnings (bug #322)
 /*
@@ -179,9 +185,6 @@ static real c_b2 = .7f;
     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 
@@ -190,9 +193,12 @@ static real c_b2 = .7f;
     real rci[160]      /* was [10][16] */;
 
 /* $Log$
- * Revision 1.15  2003/09/27 02:45:37  markster
- * Fix various compiler warnings (bug #322)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/09/27 02:45:37  markster
+/* Fix various compiler warnings (bug #322)
+/*
 /* Revision 1.2  2003/09/27 02:45:37  markster
 /* Fix various compiler warnings (bug #322)
 /*
@@ -227,9 +233,12 @@ static real c_b2 = .7f;
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
 /* $Log$
- * Revision 1.15  2003/09/27 02:45:37  markster
- * Fix various compiler warnings (bug #322)
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/09/27 02:45:37  markster
+/* Fix various compiler warnings (bug #322)
+/*
 /* Revision 1.2  2003/09/27 02:45:37  markster
 /* Fix various compiler warnings (bug #322)
 /*

diff --git a/codecs/lpc10/tbdm.c b/codecs/lpc10/tbdm.c
index c04c9ddc480070e8bc9020d13367ff27b0534fb2..2ed6e34cfc512aa86d0c6908dc1cd5ce514bb7a1 100755 (executable)
--- a/codecs/lpc10/tbdm.c
+++ b/codecs/lpc10/tbdm.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -16,11 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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,14 +26,22 @@ extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real
 
 #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 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/voicin.c b/codecs/lpc10/voicin.c
index 0b87d18c1759210c971b106c38c0b6e3c7105212..45bb5d0d36b3d9472d5df2eb333800041870b1be 100755 (executable)
--- a/codecs/lpc10/voicin.c
+++ b/codecs/lpc10/voicin.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.16  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.15  2003/11/23 22:14:32  markster
 Various warning cleanups
 
@@ -27,12 +30,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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 +37,12 @@ extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, int
 
 #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 {
@@ -54,9 +57,12 @@ extern struct {
 /*     VOICIN Version 52 */
 
 /* $Log$
- * Revision 1.15  2003/11/23 22:14:32  markster
- * Various warning cleanups
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/11/23 22:14:32  markster
+/* Various warning cleanups
+/*
 /* Revision 1.14  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*
@@ -302,9 +308,12 @@ s*/
 /*     Global Variables: */
 /*       Arguments */
 /* $Log$
- * Revision 1.15  2003/11/23 22:14:32  markster
- * Various warning cleanups
+ * Revision 1.16  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.15  2003/11/23 22:14:32  markster
+/* Various warning cleanups
+/*
 /* Revision 1.14  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*

diff --git a/codecs/lpc10/vparms.c b/codecs/lpc10/vparms.c
index 5973b9a91ad76036e12271558551ecb44050991f..b9e60293024577d93d80cdb33a7558e3da5ef696 100755 (executable)
--- a/codecs/lpc10/vparms.c
+++ b/codecs/lpc10/vparms.c
@@ -1,6 +1,9 @@
 /*
 
 $Log$
+Revision 1.15  2004/06/26 03:50:14  markster
+Merge source cleanups (bug #1911)
+
 Revision 1.14  2003/02/12 13:59:15  matteo
 mer feb 12 14:56:57 CET 2003
 
@@ -16,10 +19,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#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 +26,10 @@ extern int vparms_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, int
 
 #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;
@@ -36,9 +39,12 @@ static real c_b2 = 1.f;
 /*     VPARMS Version 50 */
 
 /* $Log$
- * Revision 1.14  2003/02/12 13:59:15  matteo
- * mer feb 12 14:56:57 CET 2003
+ * Revision 1.15  2004/06/26 03:50:14  markster
+ * Merge source cleanups (bug #1911)
  *
+/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* mer feb 12 14:56:57 CET 2003
+/*
 /* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
 /* mer feb 12 14:56:57 CET 2003
 /*