projects
/
asterisk/asterisk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0fe6d16
)
Build again without PRI
author
Mark Spencer
<markster@digium.com>
Wed, 28 Apr 2004 04:26:26 +0000
(
04:26
+0000)
committer
Mark Spencer
<markster@digium.com>
Wed, 28 Apr 2004 04:26:26 +0000
(
04:26
+0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2791
65c4cc65
-6c06-0410-ace0-
fbb531ad65f3
channels/chan_zap.c
patch
|
blob
|
history
diff --git
a/channels/chan_zap.c
b/channels/chan_zap.c
index
ab883f5
..
0752649
100755
(executable)
--- a/
channels/chan_zap.c
+++ b/
channels/chan_zap.c
@@
-3884,6
+3884,7
@@
static int zt_indicate(struct ast_channel *chan, int condition)
res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_BUSY);
break;
case AST_CONTROL_RINGING:
+#ifdef ZAPATA_PRI
if (!p->proceeding && p->sig==SIG_PRI && p->pri && p->pri->overlapdial) {
if (p->pri->pri) {
if (!pri_grab(p, p->pri)) {
@@
-3895,6
+3896,7
@@
static int zt_indicate(struct ast_channel *chan, int condition)
}
p->proceeding=1;
}
+#endif
res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_RINGTONE);
if (chan->_state != AST_STATE_UP) {
if ((chan->_state != AST_STATE_RING) ||