Make fax detect configurable by direction (bug #1803)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3174 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
5e142435b0
commit
8eb148fc8a
|
@ -4200,7 +4200,8 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
|
||||||
if ((i->callprogress & 1) && CANPROGRESSDETECT(i)) {
|
if ((i->callprogress & 1) && CANPROGRESSDETECT(i)) {
|
||||||
features |= DSP_FEATURE_CALL_PROGRESS;
|
features |= DSP_FEATURE_CALL_PROGRESS;
|
||||||
}
|
}
|
||||||
if (i->callprogress & 2) {
|
if ((!i->outgoing && (i->callprogress & 4)) ||
|
||||||
|
(i->outgoing && (i->callprogress & 2))) {
|
||||||
features |= DSP_FEATURE_FAX_DETECT;
|
features |= DSP_FEATURE_FAX_DETECT;
|
||||||
}
|
}
|
||||||
features |= DSP_FEATURE_DTMF_DETECT;
|
features |= DSP_FEATURE_DTMF_DETECT;
|
||||||
|
@ -8413,10 +8414,16 @@ static int setup_zap(void)
|
||||||
else
|
else
|
||||||
callprogress &= ~1;
|
callprogress &= ~1;
|
||||||
} else if (!strcasecmp(v->name, "faxdetect")) {
|
} else if (!strcasecmp(v->name, "faxdetect")) {
|
||||||
if (ast_true(v->value))
|
if (!strcasecmp(v->value, "incoming")) {
|
||||||
callprogress |= 2;
|
callprogress |= 4;
|
||||||
else
|
|
||||||
callprogress &= ~2;
|
callprogress &= ~2;
|
||||||
|
} else if (!strcasecmp(v->value, "outgoing")) {
|
||||||
|
callprogress &= ~4;
|
||||||
|
callprogress |= 2;
|
||||||
|
} else if (!strcasecmp(v->value, "both") || ast_true(v->value))
|
||||||
|
callprogress |= 6;
|
||||||
|
else
|
||||||
|
callprogress &= ~6;
|
||||||
} else if (!strcasecmp(v->name, "echocancel")) {
|
} else if (!strcasecmp(v->name, "echocancel")) {
|
||||||
if (v->value && !ast_strlen_zero(v->value)) {
|
if (v->value && !ast_strlen_zero(v->value)) {
|
||||||
y = atoi(v->value);
|
y = atoi(v->value);
|
||||||
|
|
|
@ -279,9 +279,12 @@ immediate=no
|
||||||
;callprogress=yes
|
;callprogress=yes
|
||||||
;progzone=us
|
;progzone=us
|
||||||
;
|
;
|
||||||
; For fax detection, uncomment the following line. The default is *OFF*
|
; For fax detection, uncomment one of the following lines. The default is *OFF*
|
||||||
;
|
;
|
||||||
;faxdetect=yes
|
;faxdetect=both
|
||||||
|
;faxdetect=incoming
|
||||||
|
;faxdetect=outgoing
|
||||||
|
;faxdetect=no
|
||||||
;
|
;
|
||||||
; Select which class of music to use for music on hold. If not specified
|
; Select which class of music to use for music on hold. If not specified
|
||||||
; then the default will be used.
|
; then the default will be used.
|
||||||
|
|
Reference in New Issue