From 2bd936105e72e2dcc1f847a28f04b2538e83020f Mon Sep 17 00:00:00 2001 From: Matteo Brancaleoni Date: Wed, 12 Feb 2003 13:59:15 +0000 Subject: [PATCH] mer feb 12 14:56:57 CET 2003 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@612 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- .cvsignore | 4 + CHANGES | 8 + apps/Makefile | 2 +- apps/app_agi.c | 2 - apps/app_macro.c | 234 +++++++++++++++++++++++ apps/app_substring.c | 2 - astman/.cvsignore | 1 + channel.c | 7 +- channels/.cvsignore | 3 + channels/Makefile | 2 +- channels/chan_iax.c | 9 +- channels/chan_mgcp.c | 39 +++- channels/chan_sip.c | 285 +++++++++++++++------------- channels/chan_zap.c | 34 ++-- channels/ixjuser.h | 7 +- cli.c | 3 + codecs/.cvsignore | 2 + codecs/lpc10/analys.c | 28 ++- codecs/lpc10/bsynz.c | 28 ++- codecs/lpc10/chanwr.c | 14 +- codecs/lpc10/dcbias.c | 14 +- codecs/lpc10/decode.c | 28 ++- codecs/lpc10/deemp.c | 14 +- codecs/lpc10/difmag.c | 14 +- codecs/lpc10/dyptrk.c | 21 ++- codecs/lpc10/encode.c | 28 ++- codecs/lpc10/energy.c | 14 +- codecs/lpc10/f2c.h | 7 +- codecs/lpc10/f2clib.c | 7 +- codecs/lpc10/ham84.c | 14 +- codecs/lpc10/hp100.c | 14 +- codecs/lpc10/invert.c | 21 ++- codecs/lpc10/irc2pc.c | 21 ++- codecs/lpc10/ivfilt.c | 14 +- codecs/lpc10/lpc10.h | 7 +- codecs/lpc10/lpcdec.c | 28 ++- codecs/lpc10/lpcenc.c | 21 ++- codecs/lpc10/lpcini.c | 28 ++- codecs/lpc10/lpfilt.c | 14 +- codecs/lpc10/median.c | 14 +- codecs/lpc10/mload.c | 14 +- codecs/lpc10/onset.c | 21 ++- codecs/lpc10/pitsyn.c | 21 ++- codecs/lpc10/placea.c | 14 +- codecs/lpc10/placev.c | 14 +- codecs/lpc10/preemp.c | 14 +- codecs/lpc10/prepro.c | 14 +- codecs/lpc10/random.c | 14 +- codecs/lpc10/rcchk.c | 14 +- codecs/lpc10/synths.c | 28 ++- codecs/lpc10/tbdm.c | 14 +- codecs/lpc10/voicin.c | 21 ++- codecs/lpc10/vparms.c | 14 +- configs/extensions.conf.sample | 333 ++++++++++++++++++--------------- editline/.cvsignore | 22 +++ editline/np/.cvsignore | 5 + include/asterisk/pbx.h | 4 + include/asterisk/rtp.h | 4 + pbx.c | 229 ++++++++++++++--------- pbx/.cvsignore | 1 + pbx/pbx_config.c | 31 ++- rtp.c | 69 ++++--- 62 files changed, 1373 insertions(+), 599 deletions(-) create mode 100755 .cvsignore create mode 100755 apps/app_macro.c create mode 100755 astman/.cvsignore create mode 100755 channels/.cvsignore create mode 100755 codecs/.cvsignore create mode 100755 editline/.cvsignore create mode 100755 editline/np/.cvsignore create mode 100755 pbx/.cvsignore diff --git a/.cvsignore b/.cvsignore new file mode 100755 index 0000000000..7dca5fe161 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,4 @@ +asterisk +build.h +ast_expr.c +.version diff --git a/CHANGES b/CHANGES index 20881564b3..55cd0d7d57 100755 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,11 @@ + -- Create special variable "EXTEN-n" where it is extension stripped by n MSD + -- Fix uninitialized frame pointer in channel.c + -- Add global variables support under [globals] of extensions.conf + -- Add macro support (show application Macro) + -- Allow [123-5] etc in extensions + -- Allow format of App(arg1,arg2,...) instead of just App,arg1|arg2 in dialplan + -- Add message waiting indicator to SIP + -- Fix double free bug in channel.c Asterisk 0.3.0 -- Add fastfoward, rewind, seek, and truncate functions to streams -- Support registration diff --git a/apps/Makefile b/apps/Makefile index 1f08653bd6..95f7275319 100755 --- a/apps/Makefile +++ b/apps/Makefile @@ -17,7 +17,7 @@ APPS=app_dial.so app_playback.so app_voicemail.so app_directory.so app_intercom. app_agi.so app_qcall.so app_adsiprog.so app_getcpeid.so app_milliwatt.so \ app_zapateller.so app_datetime.so app_setcallerid.so app_festival.so \ app_queue.so app_senddtmf.so app_parkandannounce.so app_striplsd.so \ - app_setcidname.so app_lookupcidname.so app_substring.so + app_setcidname.so app_lookupcidname.so app_substring.so app_macro.so #APPS+=app_sql_postgres.so #APPS+=app_sql_odbc.so diff --git a/apps/app_agi.c b/apps/app_agi.c index add410a801..91ca9749f8 100755 --- a/apps/app_agi.c +++ b/apps/app_agi.c @@ -72,8 +72,6 @@ STANDARD_LOCAL_USER; LOCAL_USER_DECL; -extern char *pbx_builtin_getvar_helper(struct ast_channel *chan, char *name); -extern void pbx_builtin_setvar_helper(struct ast_channel *chan, char *name, char *value); #define TONE_BLOCK_SIZE 200 diff --git a/apps/app_macro.c b/apps/app_macro.c new file mode 100755 index 0000000000..bb8b43de8b --- /dev/null +++ b/apps/app_macro.c @@ -0,0 +1,234 @@ +/* + * Asterisk -- A telephony toolkit for Linux. + * + * Macro Implementation + * + * Copyright (C) 2003, Digium + * + * Mark Spencer + * + * This program is free software, distributed under the terms of + * the GNU General Public License + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define MAX_ARGS 80 + +static char *tdesc = "Extension Macros"; + +static char *descrip = +" Macro(macroname|arg1|arg2...): Executes a macro using the context\n" +"'macro-', jumping to the 's' extension of that context and\n" +"executing each step, then returning when the steps end. The calling\n" +"extension, context, and priority are stored in ${MACRO_EXTEN}, \n" +"${MACRO_CONTEXT} and ${MACRO_PRIORITY} respectively. Arguments become\n" +"${ARG1}, ${ARG2}, etc in the macro context. Macro returns -1 if\n" +"any step in the macro returns -1, and 0 otherwise. If you Goto out\n" +"of the Macro context, the Macro will terminate and control will be return\n" +"at the location of the Goto. Otherwise if ${MACRO_OFFSET} is set at\n" +"termination, Macro will attempt to continue at priority\n" +"MACRO_OFFSET + N + 1 if such a step exists, and N + 1 otherwise.\n"; + +static char *app = "Macro"; + +static char *synopsis = "Macro Implementation"; + +STANDARD_LOCAL_USER; + +LOCAL_USER_DECL; + +static int macro_exec(struct ast_channel *chan, void *data) +{ + char tmp[256] = ""; + char *cur, *rest; + char *macro; + char fullmacro[80]; + char varname[80]; + char *oldargs[MAX_ARGS + 1] = { NULL, }; + int argc, x; + int res; + char oldexten[256]=""; + int oldpriority; + char pc[80]; + char oldcontext[256] = ""; + char *offsets; + int offset; + + char *save_macro_exten; + char *save_macro_context; + char *save_macro_priority; + char *save_macro_offset; + + if (!data || !strlen(data)) { + ast_log(LOG_WARNING, "Invalid Macro incantation\n"); + return 0; + } + strncpy(tmp, data, sizeof(tmp) - 1); + rest = tmp; + macro = strsep(&rest, "|"); + if (!macro || !strlen(macro)) { + ast_log(LOG_WARNING, "Invalid macro name specified\n"); + return 0; + } + snprintf(fullmacro, sizeof(fullmacro), "macro-%s", macro); + if (!ast_exists_extension(chan, fullmacro, "s", 1, chan->callerid)) { + if (!ast_context_find(fullmacro)) + ast_log(LOG_WARNING, "No such context '%s' for macro '%s'\n", fullmacro, macro); + else + ast_log(LOG_WARNING, "Context '%s' for macro '%s' lacks 's' extension, priority 1\n", fullmacro, macro); + return 0; + } + /* Save old info */ + oldpriority = chan->priority; + strncpy(oldexten, chan->exten, sizeof(oldexten) - 1); + strncpy(oldcontext, chan->context, sizeof(oldcontext) - 1); + argc = 1; + /* Save old macro variables */ + save_macro_exten = pbx_builtin_getvar_helper(chan, "MACRO_EXTEN"); + if (save_macro_exten) save_macro_exten = strdup(save_macro_exten); + pbx_builtin_setvar_helper(chan, "MACRO_EXTEN", oldexten); + + save_macro_context = pbx_builtin_getvar_helper(chan, "MACRO_CONTEXT"); + if (save_macro_context) save_macro_context = strdup(save_macro_context); + pbx_builtin_setvar_helper(chan, "MACRO_CONTEXT", oldcontext); + + save_macro_priority = pbx_builtin_getvar_helper(chan, "MACRO_PRIORITY"); + if (save_macro_priority) save_macro_priority = strdup(save_macro_priority); + snprintf(pc, sizeof(pc), "%d", oldpriority); + pbx_builtin_setvar_helper(chan, "MACRO_PRIORITY", pc); + + save_macro_offset = pbx_builtin_getvar_helper(chan, "MACRO_OFFSET"); + if (save_macro_offset) save_macro_offset = strdup(save_macro_offset); + pbx_builtin_setvar_helper(chan, "MACRO_OFFSET", NULL); + + /* Setup environment for new run */ + strcpy(chan->exten, "s"); + strncpy(chan->context, fullmacro, sizeof(chan->context)); + chan->priority = 1; + + while((cur = strsep(&rest, "|")) && (argc < MAX_ARGS)) { + /* Save copy of old arguments if we're overwriting some, otherwise + let them pass through to the other macro */ + oldargs[argc] = pbx_builtin_getvar_helper(chan, varname); + if (oldargs[argc]) + oldargs[argc] = strdup(oldargs[argc]); + snprintf(varname, sizeof(varname), "ARG%d", argc); + pbx_builtin_setvar_helper(chan, varname, cur); + argc++; + } + while(ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->callerid)) { + if ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->callerid))) { + /* Something bad happened, or a hangup has been requested. */ + if (((res >= '0') && (res <= '9')) || ((res >= 'A') && (res <= 'F'))) { + /* Just return result as to the previous application as if it had been dialed */ + ast_log(LOG_DEBUG, "Oooh, got something to jump out with ('%c')!\n", res); + break; + } + switch(res) { + case AST_PBX_KEEPALIVE: + if (option_debug) + ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited KEEPALIVE in macro %s on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name); + else if (option_verbose > 1) + ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited KEEPALIVE in macro '%s' on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name); + goto out; + break; + default: + if (option_debug) + ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro); + else if (option_verbose > 1) + ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro); + goto out; + } + } + if (strcasecmp(chan->context, fullmacro)) { + if (option_verbose > 1) + ast_verbose(VERBOSE_PREFIX_2 "Channel '%s' jumping out of macro '%s'\n", chan->name, macro); + break; + } + if (chan->_softhangup) { + ast_log(LOG_DEBUG, "Extension %s, priority %d returned normally even though call was hung up\n", + chan->exten, chan->priority); + goto out; + } + chan->priority++; + } +out: + for (x=1;xcontext, fullmacro)) { + /* If we're leaving the macro normally, restore original information */ + chan->priority = oldpriority; + strncpy(chan->exten, oldexten, sizeof(chan->exten) - 1); + strncpy(chan->context, oldcontext, sizeof(chan->context) - 1); + if ((offsets = pbx_builtin_getvar_helper(chan, "MACRO_OFFSET"))) { + /* Handle macro offset if it's set by checking the availability of step n + offset + 1, otherwise continue + normally if there is any problem */ + if (sscanf(offsets, "%d", &offset) == 1) { + if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + offset + 1, chan->callerid)) { + chan->priority += offset; + } + } + } + } + + pbx_builtin_setvar_helper(chan, "MACRO_OFFSET", save_macro_offset); + if (save_macro_offset) free(save_macro_offset); + return res; +} + +int unload_module(void) +{ + STANDARD_HANGUP_LOCALUSERS; + return ast_unregister_application(app); +} + +int load_module(void) +{ + return ast_register_application(app, macro_exec, synopsis, descrip); +} + +char *description(void) +{ + return tdesc; +} + +int usecount(void) +{ + int res; + STANDARD_USECOUNT(res); + return res; +} + +char *key() +{ + return ASTERISK_GPL_KEY; +} diff --git a/apps/app_substring.c b/apps/app_substring.c index a1edf64ae3..97f0fea0a2 100755 --- a/apps/app_substring.c +++ b/apps/app_substring.c @@ -27,8 +27,6 @@ static char *tdesc = "Save substring digits in a given variable"; -extern void pbx_builtin_setvar_helper(struct ast_channel *chan, char *name, char *value); - static char *descrip = " StripLSD(variable=string_of_digits|count1|count2): Assigns the substring\n" "of string_of_digits to a given variable. Parameter count1 may be positive\n" diff --git a/astman/.cvsignore b/astman/.cvsignore new file mode 100755 index 0000000000..a03052999a --- /dev/null +++ b/astman/.cvsignore @@ -0,0 +1 @@ +astman diff --git a/channel.c b/channel.c index b7c4ff355e..83659c0734 100755 --- a/channel.c +++ b/channel.c @@ -376,6 +376,7 @@ int ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin, int lock) int ast_queue_hangup(struct ast_channel *chan, int lock) { struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_HANGUP }; + chan->_softhangup |= AST_SOFTHANGUP_DEV; return ast_queue_frame(chan, &f, lock); } @@ -1145,7 +1146,7 @@ static int do_senddigit(struct ast_channel *chan, char digit) int ast_write(struct ast_channel *chan, struct ast_frame *fr) { int res = -1; - struct ast_frame *f; + struct ast_frame *f = NULL; /* Stop if we're a zombie or need a soft hangup */ if (chan->zombie || ast_check_hangup(chan)) return -1; @@ -1180,7 +1181,7 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr) default: if (chan->pvt->write) { if (chan->pvt->writetrans) { - f = ast_translate(chan->pvt->writetrans, fr, 1); + f = ast_translate(chan->pvt->writetrans, fr, 0); } else f = fr; if (f) @@ -1189,6 +1190,8 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr) res = 0; } } + if (f && (f != fr)) + ast_frfree(f); chan->blocking = 0; /* Consider a write failure to force a soft hangup */ if (res < 0) diff --git a/channels/.cvsignore b/channels/.cvsignore new file mode 100755 index 0000000000..ee5ff43b87 --- /dev/null +++ b/channels/.cvsignore @@ -0,0 +1,3 @@ +busy.h +gentone +ringtone.h diff --git a/channels/Makefile b/channels/Makefile index 7669373fcd..dc7eaf4860 100755 --- a/channels/Makefile +++ b/channels/Makefile @@ -32,7 +32,7 @@ CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR") ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri") ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2") CHANZAP=$(shell if [ -f .oldzap ]; then echo "chan_zap_old.c"; else echo "chan_zap.c"; fi) -ZAPLIB=$(shell if ! [ -f .newzap ]; then echo "-lzap"; fi) +ZAPLIB=$(shell if [ -f .oldzap ]; then echo "-lzap"; fi) ALSA_SRC=chan_alsa.c ALSA_SRC+=$(shell [ -f alsa-monitor.h ] && echo "alsa-monitor.h") diff --git a/channels/chan_iax.c b/channels/chan_iax.c index 71ca1e7f92..ce896c7385 100755 --- a/channels/chan_iax.c +++ b/channels/chan_iax.c @@ -4712,12 +4712,13 @@ static int cache_get_callno(char *data) for (x=0;xdproot)) { + if (!pthread_mutex_trylock(&iaxsl[x])) { + if (iaxs[x] && !strcasecmp(data, iaxs[x]->dproot)) { + ast_pthread_mutex_unlock(&iaxsl[x]); + return x; + } ast_pthread_mutex_unlock(&iaxsl[x]); - return x; } - ast_pthread_mutex_unlock(&iaxsl[x]); } /* No match found, we need to create a new one */ strncpy(st, data, sizeof(st)-1); diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 79e96200d7..88a0d2cf01 100755 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -380,11 +380,34 @@ static int mgcp_answer(struct ast_channel *ast) return res; } +static struct ast_frame *mgcp_rtp_read(struct mgcp_endpoint *p) +{ + /* Retrieve audio/etc from channel. Assumes p->lock is already held. */ + struct ast_frame *f; + f = ast_rtp_read(p->rtp); + if (p->owner) { + /* We already hold the channel lock */ + if (f->frametype == AST_FRAME_VOICE) { + if (f->subclass != p->owner->nativeformats) { + ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass); + p->owner->nativeformats = f->subclass; + ast_set_read_format(p->owner, p->owner->readformat); + ast_set_write_format(p->owner, p->owner->writeformat); + } + } + } + return f; +} + + static struct ast_frame *mgcp_read(struct ast_channel *ast) { - static struct ast_frame f = { AST_FRAME_NULL, }; - ast_log(LOG_DEBUG, "I should never get called but am on %s!\n", ast->name); - return &f; + struct ast_frame *fr; + struct mgcp_endpoint *p = ast->pvt->pvt; + ast_pthread_mutex_lock(&p->lock); + fr = mgcp_rtp_read(p); + ast_pthread_mutex_unlock(&p->lock); + return fr; } static int mgcp_write(struct ast_channel *ast, struct ast_frame *frame) @@ -473,6 +496,8 @@ static struct ast_channel *mgcp_new(struct mgcp_endpoint *i, int state) tmp->nativeformats = capability; fmt = ast_best_codec(tmp->nativeformats); snprintf(tmp->name, sizeof(tmp->name), "MGCP/%s@%s", i->name, i->parent->name); + if (i->rtp) + tmp->fds[0] = ast_rtp_fd(i->rtp); tmp->type = type; ast_setstate(tmp, state); if (state == AST_STATE_RING) @@ -556,6 +581,7 @@ static char *get_header(struct mgcp_request *req, char *name) return __get_header(req, name, &start); } +#if 0 static int rtpready(struct ast_rtp *rtp, struct ast_frame *f, void *data) { /* Just deliver the audio directly */ @@ -582,6 +608,7 @@ static int rtpready(struct ast_rtp *rtp, struct ast_frame *f, void *data) ast_pthread_mutex_unlock(&p->lock); return 0; } +#endif static struct mgcp_endpoint *find_endpoint(char *name, int msgid, struct sockaddr_in *sin) { @@ -1081,9 +1108,13 @@ static void start_rtp(struct mgcp_endpoint *p) { ast_pthread_mutex_lock(&p->lock); /* Allocate the RTP now */ - p->rtp = ast_rtp_new(sched, io); + p->rtp = ast_rtp_new(NULL, NULL); + if (p->rtp && p->owner) + p->owner->fds[0] = ast_rtp_fd(p->rtp); +#if 0 ast_rtp_set_callback(p->rtp, rtpready); ast_rtp_set_data(p->rtp, p); +#endif /* Make a call*ID */ snprintf(p->callid, sizeof(p->callid), "%08x%s", rand(), p->txident); /* Transmit the connection create */ diff --git a/channels/chan_sip.c b/channels/chan_sip.c index e9ec11fb13..9818b2788d 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -154,7 +154,6 @@ static struct sip_pvt { char callerid[256]; /* Caller*ID */ char via[256]; char accountcode[256]; /* Account code */ - char mailbox[AST_MAX_EXTENSION]; /* Associated mailbox */ int amaflags; /* AMA Flags */ struct sip_request initreq; /* Initial request */ @@ -183,7 +182,6 @@ struct sip_user { char callerid[80]; char methods[80]; char accountcode[80]; - char mailbox[AST_MAX_EXTENSION]; int hascallerid; int amaflags; int insecure; @@ -199,6 +197,8 @@ struct sip_peer { char methods[80]; char username[80]; char mailbox[AST_MAX_EXTENSION]; + int lastmsgssent; + time_t lastmsgcheck; int dynamic; int expire; int expirey; @@ -274,7 +274,6 @@ static int transmit_invite(struct sip_pvt *p, char *msg, int sendsdp, char *auth static int transmit_reinvite_with_sdp(struct sip_pvt *p, struct ast_rtp *rtp); static int transmit_message_with_text(struct sip_pvt *p, char *text); static int do_proxy_auth(struct sip_pvt *p, struct sip_request *req); -static int sip_send_mwi(struct sip_pvt *p); static int __sip_xmit(struct sip_pvt *p, char *data, int len) { @@ -358,7 +357,6 @@ static int create_addr(struct sip_pvt *r, char *peer) r->canreinvite = p->canreinvite; r->maxtime = p->maxms; strncpy(r->context, p->context,sizeof(r->context)-1); - strncpy(r->mailbox, p->mailbox,sizeof(r->mailbox)-1); if ((p->addr.sin_addr.s_addr || p->defaddr.sin_addr.s_addr) && (!p->maxms || ((p->lastms > 0) && (p->lastms <= p->maxms)))) { if (p->addr.sin_addr.s_addr) { @@ -638,13 +636,6 @@ static int sip_answer(struct ast_channel *ast) return res; } -static struct ast_frame *sip_read(struct ast_channel *ast) -{ - static struct ast_frame f = { AST_FRAME_NULL, }; - ast_log(LOG_DEBUG, "I should never get called but am on %s!\n", ast->name); - return &f; -} - static int sip_write(struct ast_channel *ast, struct ast_frame *frame) { struct sip_pvt *p = ast->pvt->pvt; @@ -818,6 +809,7 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state) fmt = ast_best_codec(tmp->nativeformats); snprintf(tmp->name, sizeof(tmp->name), "SIP/%s:%d", inet_ntoa(i->sa.sin_addr), ntohs(i->sa.sin_port)); tmp->type = type; + tmp->fds[0] = ast_rtp_fd(i->rtp); ast_setstate(tmp, state); if (state == AST_STATE_RING) tmp->rings = 1; @@ -922,31 +914,33 @@ static char *get_header(struct sip_request *req, char *name) return __get_header(req, name, &start); } -static int rtpready(struct ast_rtp *rtp, struct ast_frame *f, void *data) +static struct ast_frame *sip_rtp_read(struct sip_pvt *p) { - /* Just deliver the audio directly */ - struct sip_pvt *p = data; - ast_pthread_mutex_lock(&p->lock); + /* Retrieve audio/etc from channel. Assumes p->lock is already held. */ + struct ast_frame *f; + f = ast_rtp_read(p->rtp); if (p->owner) { - /* Generally, you lock in the order channel lock, followed by private - lock. Since here we are doing the reverse, there is the possibility - of deadlock. As a result, in the case of a deadlock, we simply fail out - here. */ - if (!pthread_mutex_trylock(&p->owner->lock)) { - if (f->frametype == AST_FRAME_VOICE) { - if (f->subclass != p->owner->nativeformats) { - ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass); - p->owner->nativeformats = f->subclass; - ast_set_read_format(p->owner, p->owner->readformat); - ast_set_write_format(p->owner, p->owner->writeformat); - } + /* We already hold the channel lock */ + if (f->frametype == AST_FRAME_VOICE) { + if (f->subclass != p->owner->nativeformats) { + ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass); + p->owner->nativeformats = f->subclass; + ast_set_read_format(p->owner, p->owner->readformat); + ast_set_write_format(p->owner, p->owner->writeformat); } - ast_queue_frame(p->owner, f, 0); - pthread_mutex_unlock(&p->owner->lock); } } + return f; +} + +static struct ast_frame *sip_read(struct ast_channel *ast) +{ + struct ast_frame *fr; + struct sip_pvt *p = ast->pvt->pvt; + ast_pthread_mutex_lock(&p->lock); + fr = sip_rtp_read(p); ast_pthread_mutex_unlock(&p->lock); - return 0; + return fr; } static void build_callid(char *callid, int len, struct in_addr ourip) @@ -974,7 +968,7 @@ static struct sip_pvt *sip_alloc(char *callid, struct sockaddr_in *sin) /* Keep track of stuff */ memset(p, 0, sizeof(struct sip_pvt)); p->initid = -1; - p->rtp = ast_rtp_new(sched, io); + p->rtp = ast_rtp_new(NULL, NULL); p->branch = rand(); p->tag = rand(); /* Start with 101 instead of 1 */ @@ -986,8 +980,10 @@ static struct sip_pvt *sip_alloc(char *callid, struct sockaddr_in *sin) } ast_rtp_settos(p->rtp, tos); ast_pthread_mutex_init(&p->lock); +#if 0 ast_rtp_set_data(p->rtp, p); ast_rtp_set_callback(p->rtp, rtpready); +#endif if (sin) { memcpy(&p->sa, sin, sizeof(p->sa)); memcpy(&p->ourip, myaddrfor(&p->sa.sin_addr), sizeof(p->ourip)); @@ -1238,8 +1234,8 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req) ast_log(LOG_WARNING, "No compatible codecs!\n"); return -1; } - if (p->owner && (p->owner->nativeformats != p->capability)) { - ast_log(LOG_DEBUG, "Oooh, we need to change our formats since our peer supports only %d\n", p->capability); + if (p->owner && !(p->owner->nativeformats & p->capability)) { + ast_log(LOG_DEBUG, "Oooh, we need to change our formats since our peer supports only %d and not %d\n", p->capability, p->owner->nativeformats); p->owner->nativeformats = p->capability; ast_set_read_format(p->owner, p->owner->readformat); ast_set_write_format(p->owner, p->owner->writeformat); @@ -1630,9 +1626,8 @@ static int transmit_reinvite_with_sdp(struct sip_pvt *p, struct ast_rtp *rtp) return send_response(p, &resp); } -static int transmit_invite(struct sip_pvt *p, char *cmd, int sdp, char *auth, char *vxml_url) +static void initreqprep(struct sip_request *req, struct sip_pvt *p, char *cmd, char *vxml_url) { - struct sip_request req; char invite[256]; char from[256]; char to[256]; @@ -1670,12 +1665,12 @@ static int transmit_invite(struct sip_pvt *p, char *cmd, int sdp, char *auth, ch { snprintf(to, sizeof(to), "<%s>", invite ); } - memset(&req, 0, sizeof(req)); - init_req(&req, cmd, invite); + memset(req, 0, sizeof(struct sip_request)); + init_req(req, cmd, invite); snprintf(tmp, sizeof(tmp), "%d %s", ++p->ocseq, cmd); - add_header(&req, "Via", p->via); - add_header(&req, "From", from); + add_header(req, "Via", p->via); + add_header(req, "From", from); { char contact2[256] ="", *c, contact[256]; /* XXX This isn't exactly right and it's implemented @@ -1683,12 +1678,18 @@ static int transmit_invite(struct sip_pvt *p, char *cmd, int sdp, char *auth, ch strncpy(contact2, from, sizeof(contact2)-1); c = ditch_braces(contact2); snprintf(contact, sizeof(contact), "<%s>", c); - add_header(&req, "Contact", contact); + add_header(req, "Contact", contact); } - add_header(&req, "To", to); - add_header(&req, "Call-ID", p->callid); - add_header(&req, "CSeq", tmp); - add_header(&req, "User-Agent", "Asterisk PBX"); + add_header(req, "To", to); + add_header(req, "Call-ID", p->callid); + add_header(req, "CSeq", tmp); + add_header(req, "User-Agent", "Asterisk PBX"); +} + +static int transmit_invite(struct sip_pvt *p, char *cmd, int sdp, char *auth, char *vxml_url) +{ + struct sip_request req; + initreqprep(&req, p, cmd, vxml_url); if (auth) add_header(&req, "Proxy-Authorization", auth); if (sdp) { @@ -1706,6 +1707,30 @@ static int transmit_invite(struct sip_pvt *p, char *cmd, int sdp, char *auth, ch return send_request(p, &req); } +static int transmit_notify(struct sip_pvt *p, int hasmsgs) +{ + struct sip_request req; + char tmp[256]; + char clen[20]; + initreqprep(&req, p, "NOTIFY", NULL); + add_header(&req, "Event", "message-summary"); + add_header(&req, "Content-Type", "text/plain"); + + snprintf(tmp, sizeof(tmp), "Message-Waiting: %s\n", hasmsgs ? "yes" : "no"); + snprintf(clen, sizeof(clen), "%d", strlen(tmp)); + add_header(&req, "Content-Length", clen); + add_line(&req, tmp); + + if (!p->initreq.headers) { + /* Use this as the basis */ + copy_request(&p->initreq, &req); + parse(&p->initreq); + } + + p->lastinvite = p->ocseq; + return send_request(p, &req); +} + static int transmit_register(struct sip_registry *r, char *cmd, char *auth); static int sip_reregister(void *data) @@ -1801,10 +1826,9 @@ static int transmit_register(struct sip_registry *r, char *cmd, char *auth) add_header(&req, "User-Agent", "Asterisk PBX"); if (auth) add_header(&req, "Authorization", auth); -#define EXPIRE_TIMEOUT "Thu, 01 Dec 2003 16:00:00 GMT" - - add_header(&req, "expires", EXPIRE_TIMEOUT); + snprintf(tmp, sizeof(tmp), "%d", DEFAULT_EXPIREY); + add_header(&req, "Expires", tmp); add_header(&req, "Event", "registration"); copy_request(&p->initreq, &req); r->regstate=auth?REG_STATE_AUTHSENT:REG_STATE_REGSENT; @@ -1904,8 +1928,6 @@ static int parse_contact(struct sip_pvt *pvt, struct sip_peer *p, struct sip_req strncpy(p->username, c, sizeof(p->username) - 1); else strcpy(p->username, ""); - if (p->mailbox) - strncpy(pvt->mailbox, p->mailbox,sizeof(pvt->mailbox)-1); if (p->expire > -1) ast_sched_del(sched, p->expire); if ((expirey < 1) || (expirey > MAX_EXPIREY)) @@ -2050,7 +2072,9 @@ static int register_verify(struct sip_pvt *p, struct sockaddr_in *sin, struct si if (parse_contact(p, peer, req)) { ast_log(LOG_WARNING, "Failed to parse contact info\n"); } else { + /* Say OK and ask subsystem to retransmit msg counter */ transmit_response(p, "200 OK", req); + peer->lastmsgssent = -1; res = 0; } } @@ -2230,7 +2254,6 @@ static int check_user(struct sip_pvt *p, struct sip_request *req, char *cmd, cha if (!strcasecmp(user->name, of)) { if (!(res = check_auth(p, req, p->randdata, sizeof(p->randdata), user->name, user->secret, cmd, uri))) { strncpy(p->context, user->context, sizeof(p->context) - 1); - strncpy(p->mailbox, user->mailbox, sizeof(p->mailbox) - 1); if (strlen(user->callerid) && strlen(p->callerid)) strncpy(p->callerid, user->callerid, sizeof(p->callerid) - 1); strncpy(p->accountcode, user->accountcode, sizeof(p->accountcode) -1); @@ -2705,8 +2728,8 @@ retrylock: if (r->expire != -1) ast_sched_del(sched, r->expire); expires=atoi(get_header(req, "expires")); - if (!expires) expires=20; - r->expire=ast_sched_add(sched, (expires-2)*1000, sip_reregister, r); + if (!expires) expires=DEFAULT_EXPIREY; + r->expire=ast_sched_add(sched, (expires-2)*1000, sip_reregister, r); } break; @@ -2855,7 +2878,7 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc char *cmd; char *cseq; char *e; - struct ast_channel *c; + struct ast_channel *c=NULL; int seqno; int len; int ignore=0; @@ -3006,24 +3029,24 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc ast_log(LOG_NOTICE, "Unable to create/find channel\n"); transmit_response(p, "503 Unavailable", req); sip_destroy(p); + } } - } - } else if (!strcasecmp(cmd, "REFER")) { - struct ast_channel *transfer_to; - ast_log(LOG_DEBUG, "We found a REFER!\n"); - if (!strlen(p->context)) - strncpy(p->context, context, sizeof(p->context) - 1); - res = get_refer_info(p, req); - if (res < 0) - transmit_response_with_allow(p, "404 Not Found", req); - else if (res > 0) - transmit_response_with_allow(p, "484 Address Incomplete", req); - else - transmit_response(p, "202 Accepted", req); - ast_log(LOG_DEBUG,"202 Accepted\n"); - transfer_to = c->bridge; - if (transfer_to) - ast_async_goto(transfer_to,"", p->refer_to,1, 1); + } else if (!strcasecmp(cmd, "REFER")) { + struct ast_channel *transfer_to; + ast_log(LOG_DEBUG, "We found a REFER!\n"); + if (!strlen(p->context)) + strncpy(p->context, context, sizeof(p->context) - 1); + res = get_refer_info(p, req); + if (res < 0) + transmit_response_with_allow(p, "404 Not Found", req); + else if (res > 0) + transmit_response_with_allow(p, "484 Address Incomplete", req); + else + transmit_response(p, "202 Accepted", req); + ast_log(LOG_DEBUG,"202 Accepted\n"); + transfer_to = c->bridge; + if (transfer_to) + ast_async_goto(transfer_to,"", p->refer_to,1, 1); } else if (!strcasecmp(cmd, "CANCEL") || !strcasecmp(cmd, "BYE")) { copy_request(&p->initreq, req); @@ -3055,9 +3078,9 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc transmit_response(p, "100 Trying", req); if ((res = register_verify(p, sin, req, e)) < 0) ast_log(LOG_NOTICE, "Registration from '%s' failed for '%s'\n", get_header(req, "To"), inet_ntoa(sin->sin_addr)); - sip_send_mwi(p); - if (res < 1) + if (res < 1) { sip_destroy(p); + } } else if (!strcasecmp(cmd, "ACK")) { /* Uhm, I haven't figured out the point of the ACK yet. Are we supposed to retransmit responses until we get an ack? @@ -3117,11 +3140,55 @@ static int sipsock_read(int *id, int fd, short events, void *ignore) return 1; } +static int sip_send_mwi_to_peer(struct sip_peer *peer) +{ + /* Called with peerl lock, but releases it */ + struct sip_pvt *p; + int hasmsgs; + char name[256] = ""; + /* Check for messages */ + hasmsgs = ast_app_has_voicemail(peer->mailbox); + + time(&peer->lastmsgcheck); + + /* Return now if it's the same thing we told them last time */ + if (hasmsgs == peer->lastmsgssent) { + ast_pthread_mutex_unlock(&peerl.lock); + return 0; + } + + p = sip_alloc(NULL, NULL); + if (!p) { + ast_log(LOG_WARNING, "Unable to build sip pvt data for MWI\n"); + ast_pthread_mutex_unlock(&peerl.lock); + return -1; + } + strncpy(name, peer->name, sizeof(name) - 1); + peer->lastmsgssent = hasmsgs; + ast_pthread_mutex_unlock(&peerl.lock); + if (create_addr(p, peer->name)) { + /* Maybe they're not registered, etc. */ + sip_destroy(p); + return 0; + } + /* Recalculate our side, and recalculate Call ID */ + memcpy(&p->ourip, myaddrfor(&p->sa.sin_addr), sizeof(p->ourip)); + snprintf(p->via, sizeof(p->via), "SIP/2.0/UDP %s:%d;branch=%08x", inet_ntoa(p->ourip), ourport, p->branch); + build_callid(p->callid, sizeof(p->callid), p->ourip); + /* Send MWI */ + transmit_notify(p, hasmsgs); + /* Destroy channel */ + sip_destroy(p); + return 0; +} + static void *do_monitor(void *data) { int res; struct sip_pkt *p; struct sip_pvt *sip; + struct sip_peer *peer; + time_t t; /* Add an I/O event to our UDP socket */ if (sipsock > -1) ast_io_add(io, sipsock, sipsock_read, AST_IO_IN, NULL); @@ -3165,6 +3232,19 @@ restartsearch: ast_pthread_mutex_lock(&monlock); if (res >= 0) ast_sched_runq(sched); + ast_pthread_mutex_lock(&peerl.lock); + peer = peerl.peers; + time(&t); + while(peer) { + if (strlen(peer->mailbox) && (t - peer->lastmsgcheck > 10)) { + sip_send_mwi_to_peer(peer); + break; + } + peer = peer->next; + } + /* Remember, sip_send_mwi_to_peer releases the lock if we've called it */ + if (!peer) + ast_pthread_mutex_unlock(&peerl.lock); ast_pthread_mutex_unlock(&monlock); } /* Never reached */ @@ -3260,60 +3340,6 @@ static int sip_poke_peer(struct sip_peer *peer) } -static int sip_send_mwi(struct sip_pvt *p) -{ - struct sip_request req; - int res; - - if(strlen(p->mailbox)) { - ast_log(LOG_NOTICE, "mwi: check mailbox: %s\n", p->mailbox); - res = ast_app_has_voicemail(p->mailbox); - if(res) { - ast_log(LOG_NOTICE, "mwi: mailbox has messages\n"); - reqprep(&req, p, "NOTIFY", 1); - add_header(&req, "Event", "message-summary"); - add_header(&req, "Content-Type", "text/plain"); - add_line(&req, "Message-Waiting: yes\n"); - send_request(p, &req); - - } else { - - ast_log(LOG_NOTICE, "mwi: mailbox does not contain messages\n"); - reqprep(&req, p, "NOTIFY", 1); - add_header(&req, "Event", "message-summary"); - add_header(&req, "Content-Type", "text/plain"); - add_line(&req, "Message-Waiting: no\n"); - send_request(p, &req); - } - - } - return 0; - -} - -static int sip_send_mwi_to_peer(struct sip_peer *peer) -{ - struct sip_pvt *p; - p = sip_alloc(NULL, NULL); - if (!p) { - ast_log(LOG_WARNING, "Unable to build sip pvt data for MWI\n"); - return -1; - } - if (create_addr(p, peer->name)) { - sip_destroy(p); - return -1; - } - /* Recalculate our side, and recalculate Call ID */ - memcpy(&p->ourip, myaddrfor(&p->sa.sin_addr), sizeof(p->ourip)); - snprintf(p->via, sizeof(p->via), "SIP/2.0/UDP %s:%d;branch=%08x", inet_ntoa(p->ourip), ourport, p->branch); - build_callid(p->callid, sizeof(p->callid), p->ourip); - /* Send MWI */ - sip_send_mwi(p); - /* Destroy channel */ - sip_destroy(p); - return 0; -} - static struct ast_channel *sip_request(char *type, int format, void *data) { int oldformat; @@ -3326,7 +3352,7 @@ static struct ast_channel *sip_request(char *type, int format, void *data) oldformat = format; format &= capability; if (!format) { - ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format '%d'\n", format); + ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format %d while capability is %d\n", oldformat, capability); return NULL; } p = sip_alloc(NULL, NULL); @@ -3397,8 +3423,6 @@ static struct sip_user *build_user(char *name, struct ast_variable *v) user->hascallerid=1; } else if (!strcasecmp(v->name, "accountcode")) { strncpy(user->accountcode, v->value, sizeof(user->accountcode)-1); - } else if (!strcasecmp(v->name, "mailbox")) { - strncpy(user->mailbox, v->value, sizeof(user->mailbox)-1); } else if (!strcasecmp(v->name, "amaflags")) { format = ast_cdr_amaflags2int(v->value); if (format < 0) { @@ -3451,6 +3475,7 @@ static struct sip_peer *build_peer(char *name, struct ast_variable *v) memset(peer, 0, sizeof(struct sip_peer)); peer->expire = -1; peer->pokeexpire = -1; + peer->lastmsgssent = -1; } if (peer) { if (!found) { @@ -3515,7 +3540,7 @@ static struct sip_peer *build_peer(char *name, struct ast_variable *v) } else if (!strcasecmp(v->name, "username")) { strncpy(peer->username, v->value, sizeof(peer->username)-1); } else if (!strcasecmp(v->name, "mailbox")) { - strncpy(peer->mailbox, v->value, sizeof(peer->mailbox)-1); + strncpy(peer->mailbox, v->value, sizeof(peer->mailbox)-1); } else if (!strcasecmp(v->name, "allow")) { format = ast_getformatbyname(v->value); if (format < 1) diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 342038e3db..5244bbe685 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -3320,6 +3320,8 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int /* Assume calls are not idle calls unless we're told differently */ i->isidlecall = 0; #endif + /* Assure there is no confmute on this channel */ + zt_confmute(i, 0); if (startpbx) { if (ast_pbx_start(tmp)) { ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name); @@ -5260,6 +5262,7 @@ static void *pri_dchannel(void *vpri) pri->pvt[x]->owner->_softhangup |= AST_SOFTHANGUP_DEV; } break; + case PRI_EVENT_INFO_RECEIVED: case PRI_EVENT_RING: chan = e->ring.channel; if ((chan < 1) || (chan > pri->channels)) { @@ -5281,20 +5284,22 @@ static void *pri_dchannel(void *vpri) if (!chan && (e->ring.flexible)) chan = pri_find_empty_chan(pri); if (chan) { - /* Get caller ID */ - if (pri->pvt[chan]->use_callerid) { - if (strlen(e->ring.callingname)) { - snprintf(pri->pvt[chan]->callerid, sizeof(pri->pvt[chan]->callerid), "\"%s\" <%s>", e->ring.callingname, e->ring.callingnum); + if (e->e==PRI_EVENT_RING) { + /* Get caller ID */ + if (pri->pvt[chan]->use_callerid) { + if (strlen(e->ring.callingname)) { + snprintf(pri->pvt[chan]->callerid, sizeof(pri->pvt[chan]->callerid), "\"%s\" <%s>", e->ring.callingname, e->ring.callingnum); + } else + strncpy(pri->pvt[chan]->callerid, e->ring.callingnum, sizeof(pri->pvt[chan]->callerid)-1); } else - strncpy(pri->pvt[chan]->callerid, e->ring.callingnum, sizeof(pri->pvt[chan]->callerid)-1); - } else - strcpy(pri->pvt[chan]->callerid, ""); + strcpy(pri->pvt[chan]->callerid, ""); + strncpy(pri->pvt[chan]->rdnis, e->ring.redirectingnum, sizeof(pri->pvt[chan]->rdnis)); + } /* Get called number */ if (strlen(e->ring.callednum)) { strncpy(pri->pvt[chan]->exten, e->ring.callednum, sizeof(pri->pvt[chan]->exten)-1); } else strcpy(pri->pvt[chan]->exten, "s"); - strncpy(pri->pvt[chan]->rdnis, e->ring.redirectingnum, sizeof(pri->pvt[chan]->rdnis)); /* Make sure extension exists */ if (ast_exists_extension(NULL, pri->pvt[chan]->context, pri->pvt[chan]->exten, 1, pri->pvt[chan]->callerid)) { /* Setup law */ @@ -5324,10 +5329,15 @@ static void *pri_dchannel(void *vpri) pri->pvt[chan]->call = 0; } } else { - if (option_verbose > 2) - ast_verbose(VERBOSE_PREFIX_3 "Extension '%s' in context '%s' from '%s' does not exist. Rejecting call on channel %d, span %d\n", - pri->pvt[chan]->exten, pri->pvt[chan]->context, pri->pvt[chan]->callerid, chan, pri->span); - pri_release(pri->pri, e->ring.call, PRI_CAUSE_UNALLOCATED); + if (ast_matchmore_extension(NULL, pri->pvt[chan]->context, pri->pvt[chan]->exten, 1, pri->pvt[chan]->callerid)) + { + if (e->e==PRI_EVENT_RING) pri_need_more_info(pri->pri, e->ring.call, chan, 1); + } else { + if (option_verbose > 2) + ast_verbose(VERBOSE_PREFIX_3 "Extension '%s' in context '%s' from '%s' does not exist. Rejecting call on channel %d, span %d\n", + pri->pvt[chan]->exten, pri->pvt[chan]->context, pri->pvt[chan]->callerid, chan, pri->span); + pri_release(pri->pri, e->ring.call, PRI_CAUSE_UNALLOCATED); + } } } else pri_release(pri->pri, e->ring.call, PRI_CAUSE_REQUESTED_CHAN_UNAVAIL); diff --git a/channels/ixjuser.h b/channels/ixjuser.h index 2de8abd1ab..ac98a6c0c0 100755 --- a/channels/ixjuser.h +++ b/channels/ixjuser.h @@ -1,8 +1,11 @@ /****************************************************************************** $Id$ $Log$ -Revision 1.15 1999/12/01 05:25:58 markster -Version 0.3.0 from FTP +Revision 1.16 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 Revision 1.1 1999/12/01 05:25:58 markster Start on the Internet Phone Jack channel diff --git a/cli.c b/cli.c index 14cf3956ca..d7ebcc7585 100755 --- a/cli.c +++ b/cli.c @@ -198,6 +198,7 @@ static int handle_chanlist(int fd, int argc, char *argv[]) #define FORMAT_STRING "%15s (%-10s %-12s %-4d) %7s %-12s %-15s\n" #define FORMAT_STRING2 "%15s (%-10s %-12s %-4s) %7s %-12s %-15s\n" struct ast_channel *c=NULL; + int numchans = 0; if (argc != 2) return RESULT_SHOWUSAGE; c = ast_channel_walk(NULL); @@ -205,8 +206,10 @@ static int handle_chanlist(int fd, int argc, char *argv[]) while(c) { ast_cli(fd, FORMAT_STRING, c->name, c->context, c->exten, c->priority, ast_state2str(c->_state), c->appl ? c->appl : "(None)", c->data ? ( strlen(c->data) ? c->data : "(Empty)" ): "(None)"); + numchans++; c = ast_channel_walk(c); } + ast_cli(fd, "%d active channel(s)\n", numchans); return RESULT_SUCCESS; } diff --git a/codecs/.cvsignore b/codecs/.cvsignore new file mode 100755 index 0000000000..428ba001b5 --- /dev/null +++ b/codecs/.cvsignore @@ -0,0 +1,2 @@ +g723.1 +g723.1b diff --git a/codecs/lpc10/analys.c b/codecs/lpc10/analys.c index c90f2c1ecd..c9d078a855 100755 --- a/codecs/lpc10/analys.c +++ b/codecs/lpc10/analys.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -79,9 +82,12 @@ static integer c__1 = 1; /* ANALYS Version 55 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -246,9 +252,12 @@ static integer c__1 = 1; real phi[100] /* was [10][10] */, psi[10]; /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -277,9 +286,12 @@ static integer c__1 = 1; /* Frame size, Prediction order, Pitch period */ /* Arguments to ANALYS */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/bsynz.c b/codecs/lpc10/bsynz.c index c0dedea1ea..6c15ebb624 100755 --- a/codecs/lpc10/bsynz.c +++ b/codecs/lpc10/bsynz.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -48,9 +51,12 @@ extern struct { /* BSYNZ Version 54 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -144,9 +150,12 @@ extern struct { real lpi0, hpi0; /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -175,9 +184,12 @@ extern struct { /* Frame size, Prediction order, Pitch period */ /* Arguments */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/chanwr.c b/codecs/lpc10/chanwr.c index ebd5631d54..5b600822fd 100755 --- a/codecs/lpc10/chanwr.c +++ b/codecs/lpc10/chanwr.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -35,9 +38,12 @@ extern int chanrd_(integer *order, integer *ipitv, integer *irms, integer *irc, /* CHANL Version 49 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/dcbias.c b/codecs/lpc10/dcbias.c index 5aa29e4b08..b34480a4e5 100755 --- a/codecs/lpc10/dcbias.c +++ b/codecs/lpc10/dcbias.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -29,9 +32,12 @@ extern int dcbias_(integer *len, real *speech, real *sigout); /* DCBIAS Version 50 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/decode.c b/codecs/lpc10/decode.c index 51319daff2..3e7b5747a2 100755 --- a/codecs/lpc10/decode.c +++ b/codecs/lpc10/decode.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -53,9 +56,12 @@ static integer c__2 = 2; /* DECODE Version 54 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -188,9 +194,12 @@ static integer c__2 = 2; integer ishift, errcnt, lsb; /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -219,9 +228,12 @@ static integer c__2 = 2; /* Frame size, Prediction order, Pitch period */ /* Arguments */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/deemp.c b/codecs/lpc10/deemp.c index 52e20886ac..a79d84adc9 100755 --- a/codecs/lpc10/deemp.c +++ b/codecs/lpc10/deemp.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -37,9 +40,12 @@ extern int deemp_(real *x, integer *n, struct lpc10_decoder_state *st); /* DEEMP Version 48 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/difmag.c b/codecs/lpc10/difmag.c index 918b68c254..734ad9665a 100755 --- a/codecs/lpc10/difmag.c +++ b/codecs/lpc10/difmag.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -29,9 +32,12 @@ extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau, in /* DIFMAG Version 49 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/dyptrk.c b/codecs/lpc10/dyptrk.c index 227c97887c..7a5c136b99 100755 --- a/codecs/lpc10/dyptrk.c +++ b/codecs/lpc10/dyptrk.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -47,9 +50,12 @@ extern struct { /* DYPTRK Version 52 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -136,9 +142,12 @@ extern struct { /* Arguments */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/encode.c b/codecs/lpc10/encode.c index e1733171fd..81093ac607 100755 --- a/codecs/lpc10/encode.c +++ b/codecs/lpc10/encode.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -43,9 +46,12 @@ static integer c__2 = 2; /* ENCODE Version 54 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -128,9 +134,12 @@ static integer c__2 = 2; integer idel, nbit, i__, j, i2, i3, mrk; /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -151,9 +160,12 @@ static integer c__2 = 2; /* Frame size, Prediction order, Pitch period */ /* Arguments */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/energy.c b/codecs/lpc10/energy.c index d5b9700d8c..f159dd52ac 100755 --- a/codecs/lpc10/energy.c +++ b/codecs/lpc10/energy.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -29,9 +32,12 @@ extern int energy_(integer *len, real *speech, real *rms); /* ENERGY Version 50 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/f2c.h b/codecs/lpc10/f2c.h index 594d3706de..7f4bcf2578 100755 --- a/codecs/lpc10/f2c.h +++ b/codecs/lpc10/f2c.h @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work diff --git a/codecs/lpc10/f2clib.c b/codecs/lpc10/f2clib.c index 0e7e8dc87f..e72c307c6a 100755 --- a/codecs/lpc10/f2clib.c +++ b/codecs/lpc10/f2clib.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work diff --git a/codecs/lpc10/ham84.c b/codecs/lpc10/ham84.c index a9665d690d..c4848b1eee 100755 --- a/codecs/lpc10/ham84.c +++ b/codecs/lpc10/ham84.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -29,9 +32,12 @@ extern int ham84_(integer *input, integer *output, integer *errcnt); /* HAM84 Version 45G */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/hp100.c b/codecs/lpc10/hp100.c index b223d43dff..7dae73b7ff 100755 --- a/codecs/lpc10/hp100.c +++ b/codecs/lpc10/hp100.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -39,9 +42,12 @@ extern int inithp100_(void); /* HP100 Version 55 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/invert.c b/codecs/lpc10/invert.c index 203c7acdea..56045915e9 100755 --- a/codecs/lpc10/invert.c +++ b/codecs/lpc10/invert.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -29,9 +32,12 @@ extern int invert_(integer *order, real *phi, real *psi, real *rc); /* INVERT Version 45G */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -91,9 +97,12 @@ extern int invert_(integer *order, real *phi, real *psi, real *rc); /* Arguments */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/irc2pc.c b/codecs/lpc10/irc2pc.c index 6f0b2d1b5d..a178442e60 100755 --- a/codecs/lpc10/irc2pc.c +++ b/codecs/lpc10/irc2pc.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -29,9 +32,12 @@ extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pas /* IRC2PC Version 48 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -82,9 +88,12 @@ extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pas /* Arguments */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/ivfilt.c b/codecs/lpc10/ivfilt.c index 2f559012a7..98184e4f03 100755 --- a/codecs/lpc10/ivfilt.c +++ b/codecs/lpc10/ivfilt.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -29,9 +32,12 @@ extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real /* IVFILT Version 48 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/lpc10.h b/codecs/lpc10/lpc10.h index 5804fc57b9..ef7d4eeacc 100755 --- a/codecs/lpc10/lpc10.h +++ b/codecs/lpc10/lpc10.h @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 00:20:06 markster -Version 0.3.0 from FTP +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 Revision 1.1 2000/01/05 00:20:06 markster Add broken lpc10 code... It's not too far from working I don't think... diff --git a/codecs/lpc10/lpcdec.c b/codecs/lpc10/lpcdec.c index ea68c61d64..9929d1fbfe 100755 --- a/codecs/lpc10/lpcdec.c +++ b/codecs/lpc10/lpcdec.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -58,9 +61,12 @@ static integer c__10 = 10; /* ***************************************************************** */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -113,9 +119,12 @@ static integer c__10 = 10; real rms; /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -147,9 +156,12 @@ static integer c__10 = 10; /* Frame size, Prediction order, Pitch period */ /* Arguments */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/lpcenc.c b/codecs/lpc10/lpcenc.c index 680da5b609..a3222af9dc 100755 --- a/codecs/lpc10/lpcenc.c +++ b/codecs/lpc10/lpcenc.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -50,9 +53,12 @@ static integer c__10 = 10; /* ***************************************************************** */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -109,9 +115,12 @@ static integer c__10 = 10; /* Arguments */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/lpcini.c b/codecs/lpc10/lpcini.c index bd6b01ae7c..90d61b9878 100755 --- a/codecs/lpc10/lpcini.c +++ b/codecs/lpc10/lpcini.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -45,9 +48,12 @@ struct { /* ***************************************************************** */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -71,9 +77,12 @@ struct { { /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -97,9 +106,12 @@ struct { /* LPC Configuration parameters: */ /* Frame size, Prediction order, Pitch period */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/lpfilt.c b/codecs/lpc10/lpfilt.c index 3f599f542a..9dff6b52a6 100755 --- a/codecs/lpc10/lpfilt.c +++ b/codecs/lpc10/lpfilt.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -29,9 +32,12 @@ extern int lpfilt_(real *inbuf, real *lpbuf, integer *len, integer *nsamp); /* LPFILT Version 55 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/median.c b/codecs/lpc10/median.c index fcd3d7dce2..376c46c426 100755 --- a/codecs/lpc10/median.c +++ b/codecs/lpc10/median.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -29,9 +32,12 @@ extern integer median_(integer *d1, integer *d2, integer *d3); /* MEDIAN Version 45G */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/mload.c b/codecs/lpc10/mload.c index 63bcf5ca07..0789cfa43a 100755 --- a/codecs/lpc10/mload.c +++ b/codecs/lpc10/mload.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -29,9 +32,12 @@ extern int mload_(integer *order, integer *awins, integer *awinf, real *speech, /* MLOAD Version 48 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/onset.c b/codecs/lpc10/onset.c index 8a115f17c5..1e9c1d0f75 100755 --- a/codecs/lpc10/onset.c +++ b/codecs/lpc10/onset.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -41,9 +44,12 @@ static real c_b2 = 1.f; /* ONSET Version 49 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -143,9 +149,12 @@ static real c_b2 = 1.f; /* Arguments */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/pitsyn.c b/codecs/lpc10/pitsyn.c index 52e41ccac2..b5bffde5cb 100755 --- a/codecs/lpc10/pitsyn.c +++ b/codecs/lpc10/pitsyn.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -37,9 +40,12 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re /* PITSYN Version 53 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -143,9 +149,12 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re /* Arguments */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/placea.c b/codecs/lpc10/placea.c index 3db692cdec..7e705e7f1d 100755 --- a/codecs/lpc10/placea.c +++ b/codecs/lpc10/placea.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2001/04/12 21:27:53 markster -Version 0.3.0 from FTP +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 Revision 1.3 2001/04/12 21:27:53 markh app_record now supports wildcards of sort so your output file is not overwritten every time it's run. File.h got a documentation update on the ast_fileexists to include the return call. Watch out for the placea.c placev.c code, it's updates have not been tested yet. Just a few parenthesis to make it compile nicer on newer gcc versions with all the -W flags set. @@ -32,9 +35,12 @@ extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *a /* PLACEA Version 48 */ /* $Log$ - * Revision 1.13 2001/04/12 21:27:53 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.3 2001/04/12 21:27:53 markh /* app_record now supports wildcards of sort so your output file is not overwritten every time it's run. File.h got a documentation update on the ast_fileexists to include the return call. Watch out for the placea.c placev.c code, it's updates have not been tested yet. Just a few parenthesis to make it compile nicer on newer gcc versions with all the -W flags set. /* diff --git a/codecs/lpc10/placev.c b/codecs/lpc10/placev.c index 93dbd6d5ac..eae5fcdec1 100755 --- a/codecs/lpc10/placev.c +++ b/codecs/lpc10/placev.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2001/04/12 21:27:53 markster -Version 0.3.0 from FTP +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 Revision 1.3 2001/04/12 21:27:53 markh app_record now supports wildcards of sort so your output file is not overwritten every time it's run. File.h got a documentation update on the ast_fileexists to include the return call. Watch out for the placea.c placev.c code, it's updates have not been tested yet. Just a few parenthesis to make it compile nicer on newer gcc versions with all the -W flags set. @@ -32,9 +35,12 @@ extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obou /* PLACEV Version 48 */ /* $Log$ - * Revision 1.13 2001/04/12 21:27:53 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.3 2001/04/12 21:27:53 markh /* app_record now supports wildcards of sort so your output file is not overwritten every time it's run. File.h got a documentation update on the ast_fileexists to include the return call. Watch out for the placea.c placev.c code, it's updates have not been tested yet. Just a few parenthesis to make it compile nicer on newer gcc versions with all the -W flags set. /* diff --git a/codecs/lpc10/preemp.c b/codecs/lpc10/preemp.c index f6dec775c8..05fb9fb6d7 100755 --- a/codecs/lpc10/preemp.c +++ b/codecs/lpc10/preemp.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -29,9 +32,12 @@ extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z /* PREEMP Version 55 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/prepro.c b/codecs/lpc10/prepro.c index 53c14ba915..e21b4ca386 100755 --- a/codecs/lpc10/prepro.c +++ b/codecs/lpc10/prepro.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -44,9 +47,12 @@ static integer c__1 = 1; /* PREPRO Version 48 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/random.c b/codecs/lpc10/random.c index 4bee0e89e6..ec3ef45e7c 100755 --- a/codecs/lpc10/random.c +++ b/codecs/lpc10/random.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -37,9 +40,12 @@ extern integer random_(struct lpc10_decoder_state *st); /* RANDOM Version 49 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/rcchk.c b/codecs/lpc10/rcchk.c index 17d3c190dd..a2fe86702c 100755 --- a/codecs/lpc10/rcchk.c +++ b/codecs/lpc10/rcchk.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -29,9 +32,12 @@ extern int rcchk_(integer *order, real *rc1f, real *rc2f); /* RCCHK Version 45G */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/synths.c b/codecs/lpc10/synths.c index 4f8efac5bd..33becea658 100755 --- a/codecs/lpc10/synths.c +++ b/codecs/lpc10/synths.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:39 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -58,9 +61,12 @@ static real c_b2 = .7f; /* SYNTHS Version 54 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -178,9 +184,12 @@ static real c_b2 = .7f; real rci[160] /* was [10][16] */; /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -209,9 +218,12 @@ static real c_b2 = .7f; /* Frame size, Prediction order, Pitch period */ /* Arguments */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:39 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/tbdm.c b/codecs/lpc10/tbdm.c index d3b49c9e71..c04c9ddc48 100755 --- a/codecs/lpc10/tbdm.c +++ b/codecs/lpc10/tbdm.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:40 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:40 markster Some OSS fixes and a few lpc changes to make it actually work @@ -30,9 +33,12 @@ extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real /* TBDM Version 49 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:40 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:40 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/voicin.c b/codecs/lpc10/voicin.c index 2c92aad33c..ae7eb1507b 100755 --- a/codecs/lpc10/voicin.c +++ b/codecs/lpc10/voicin.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:40 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:40 markster Some OSS fixes and a few lpc changes to make it actually work @@ -48,9 +51,12 @@ extern struct { /* VOICIN Version 52 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:40 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:40 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -290,9 +296,12 @@ s*/ /* Global Variables: */ /* Arguments */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:40 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:40 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/codecs/lpc10/vparms.c b/codecs/lpc10/vparms.c index 3bd2d58d2c..5973b9a91a 100755 --- a/codecs/lpc10/vparms.c +++ b/codecs/lpc10/vparms.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.13 2000/01/05 08:20:40 markster -Version 0.3.0 from FTP +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 Revision 1.2 2000/01/05 08:20:40 markster Some OSS fixes and a few lpc changes to make it actually work @@ -33,9 +36,12 @@ static real c_b2 = 1.f; /* VPARMS Version 50 */ /* $Log$ - * Revision 1.13 2000/01/05 08:20:40 markster - * Version 0.3.0 from FTP + * 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 +/* /* Revision 1.2 2000/01/05 08:20:40 markster /* Some OSS fixes and a few lpc changes to make it actually work /* diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample index b408feb46b..325cf2e2a2 100755 --- a/configs/extensions.conf.sample +++ b/configs/extensions.conf.sample @@ -2,8 +2,7 @@ ; Static extension configuration files, used by ; the pbx_config module. ; -; The "General" category is for certain variables. All other categories -; are interpreted as extension contexts +; The "General" category is for certain variables. ; [general] ; @@ -14,24 +13,68 @@ ; XXX Not yet implemented XXX ; static=yes - ; -; if stati=yes and writeprotect=no, you can save dialplan by +; if static=yes and writeprotect=no, you can save dialplan by ; CLI command 'save dialplan' too ; writeprotect=no -; Remote things always ring all phones first. -;[remote] -;exten => s,1,Dial,AdtranVoFR/4200&AdtranVoFR/4151&AdtranVoFR/4300|15 -;exten => s,2,Goto,default|s|2 -;include => default +; +; The "Globals" category contains global variables that can be referenced +; in the dialplan with ${VARIABLE} +; +[globals] +CONSOLE=Console/dsp ; Console interface for demo +;CONSOLE=Zap/1 +;CONSOLE=Phone/phone0 +IAXINFO=guest ; IAXtel username/password +;IAXINFO=myuser:mypass +TRUNK=Zap/g2 ; Trunk interface +;TRUNK=IAX/user:pass@provider + +; +; Any category other than "General" and "Globals" represent +; extension contexts, which are collections of extensions. +; +; Extension names may be numbers, letters, or combinations +; thereof. If an extension name is prefixed by a '_' +; character, it is interpreted as a pattern rather than a +; literal. In patterns, some characters have special meanings: +; +; X - any digit from 0-9 +; N - any digit from 2-9 +; [1235-9] - any digit in the brackets (in this example, 1,2,3,5,6,7,8,9) +; . - wildcard, matches anything remaining (e.g. _9011. matches anything starting with 9011 including 9011) +; +; For example the extenion _NXXXXXX would match normal 7 digit dialings, while +; _1NXXNXXXXXX would represent an area code plus phone number +; preceeded by a one. +; +; Contexts contain several lines, one for each step of each +; extension, which can take one of two forms as listed below, +; with the first form being preferred. One may include another +; context in the current one as well, optionally with a +; date and time. Included contexts are included in the order +; they are listed. +; +;[context] +;exten => someexten,priority,application(arg1,arg2,...) +;exten => someexten,priority,application,arg1|arg2... ; ; Timing list for includes is ; ;