[asterisk-commits] [svn-commits] juggie: branch group/cdr_backend_ast_str r111082 - /team/group/cdr_backend_as...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Mar 26 14:29:24 CDT 2008
Author: juggie
Date: Wed Mar 26 14:29:23 2008
New Revision: 111082
URL: http://svn.digium.com/view/asterisk?view=rev&rev=111082
Log:
Merged revisions 110911 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r110911 | juggie | 2008-03-26 13:24:54 -0400 (Wed, 26 Mar 2008) | 8 lines
update documentation to reflect the changes in the way configure detects net-snmp.
(closes issue #12067)
Reported by: juggie
Patches:
12067_snmp_doc.patch uploaded by juggie (license 24)
Tested by: juggie
........
Modified:
team/group/cdr_backend_ast_str/channels/chan_usbradio.c
team/group/cdr_backend_ast_str/channels/chan_vpb.cc
team/group/cdr_backend_ast_str/channels/chan_zap.c
Modified: team/group/cdr_backend_ast_str/channels/chan_usbradio.c
URL: http://svn.digium.com/view/asterisk/team/group/cdr_backend_ast_str/channels/chan_usbradio.c?view=diff&rev=111082&r1=111081&r2=111082
==============================================================================
--- team/group/cdr_backend_ast_str/channels/chan_usbradio.c (original)
+++ team/group/cdr_backend_ast_str/channels/chan_usbradio.c Wed Mar 26 14:29:23 2008
@@ -1210,8 +1210,6 @@
if (o->dsp) {
f1 = ast_dsp_process(c, o->dsp, f);
if ((f1->frametype == AST_FRAME_DTMF_END) || (f1->frametype == AST_FRAME_DTMF_BEGIN)) {
- if ((f1->subclass == 'm') || (f1->subclass == 'u'))
- f1->frametype = AST_FRAME_DTMF_BEGIN;
if (f1->frametype == AST_FRAME_DTMF_END)
ast_log(LOG_NOTICE,"Got DTMF char %c\n",f1->subclass);
return f1;
Modified: team/group/cdr_backend_ast_str/channels/chan_vpb.cc
URL: http://svn.digium.com/view/asterisk/team/group/cdr_backend_ast_str/channels/chan_vpb.cc?view=diff&rev=111082&r1=111081&r2=111082
==============================================================================
--- team/group/cdr_backend_ast_str/channels/chan_vpb.cc (original)
+++ team/group/cdr_backend_ast_str/channels/chan_vpb.cc Wed Mar 26 14:29:23 2008
@@ -2400,14 +2400,6 @@
fr = ast_dsp_process(p->owner,p->vad,fr);
if (fr && (fr->frametype == AST_FRAME_DTMF))
ast_debug(1, "%s: chanreads: Detected DTMF '%c'\n", p->dev, fr->subclass);
- if (fr->subclass == 'm') {
- /* conf mute request */
- fr->frametype = AST_FRAME_NULL;
- fr->subclass = 0;
- } else if (fr->subclass == 'u') {
- /* Unmute */
- fr->frametype = AST_FRAME_NULL;
- fr->subclass = 0;
} else if (fr->subclass == 'f') {
}
}
Modified: team/group/cdr_backend_ast_str/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/group/cdr_backend_ast_str/channels/chan_zap.c?view=diff&rev=111082&r1=111081&r2=111082
==============================================================================
--- team/group/cdr_backend_ast_str/channels/chan_zap.c (original)
+++ team/group/cdr_backend_ast_str/channels/chan_zap.c Wed Mar 26 14:29:23 2008
@@ -706,6 +706,7 @@
unsigned int loopedback:1;
#endif
char begindigit;
+ int muting;
} *iflist = NULL, *ifend = NULL;
/*! \brief Channel configuration from zapata.conf .
@@ -2988,6 +2989,7 @@
x = 0;
zt_confmute(p, 0);
+ p->muting = 0;
restore_gains(p);
if (p->origcid_num) {
ast_copy_string(p->cid_num, p->origcid_num, sizeof(p->cid_num));
@@ -4232,8 +4234,7 @@
ast_free(p->cidspill);
send_cwcidspill(p);
}
- if ((f->subclass != 'm') && (f->subclass != 'u'))
- p->callwaitcas = 0;
+ p->callwaitcas = 0;
p->subs[index].f.frametype = AST_FRAME_NULL;
p->subs[index].f.subclass = 0;
*dest = &p->subs[index].f;
@@ -4260,20 +4261,7 @@
p->subs[index].f.frametype = AST_FRAME_NULL;
p->subs[index].f.subclass = 0;
*dest = &p->subs[index].f;
- } else if (f->subclass == 'm') {
- /* Confmute request */
- zt_confmute(p, 1);
- p->subs[index].f.frametype = AST_FRAME_NULL;
- p->subs[index].f.subclass = 0;
- *dest = &p->subs[index].f;
- } else if (f->subclass == 'u') {
- /* Unmute */
- zt_confmute(p, 0);
- p->subs[index].f.frametype = AST_FRAME_NULL;
- p->subs[index].f.subclass = 0;
- *dest = &p->subs[index].f;
- } else
- zt_confmute(p, 0);
+ }
}
static struct ast_frame *zt_handle_event(struct ast_channel *ast)
@@ -5463,7 +5451,17 @@
}
if (p->dsp && (!p->ignoredtmf || p->callwaitcas || p->busydetect || p->callprogress) && !index) {
/* Perform busy detection. etc on the zap line */
+ int mute;
+
f = ast_dsp_process(ast, p->dsp, &p->subs[index].f);
+
+ /* Check if DSP code thinks we should be muting this frame and mute the conference if so */
+ mute = ast_dsp_was_muted(p->dsp);
+ if (p->muting != mute) {
+ p->muting = mute;
+ zt_confmute(p, mute);
+ }
+
if (f) {
if ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_BUSY)) {
if ((ast->_state == AST_STATE_UP) && !p->outgoing) {
@@ -5996,6 +5994,7 @@
i->fake_event = 0;
/* Assure there is no confmute on this channel */
zt_confmute(i, 0);
+ i->muting = 0;
/* Configure the new channel jb */
ast_jb_configure(tmp, &global_jbconf);
_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.com--
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
More information about the asterisk-commits
mailing list