aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_zap.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-12-27 00:07:45 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-12-27 00:07:45 +0000
commitae86d6c49b6d0e44cb2bf0f92efa25b2302776a3 (patch)
tree079ab7ea3df5d3f027f47015024bac8b08bc8aed /channels/chan_zap.c
parentf0c0abb15f7e58b198a0222d44afa1e528e7382b (diff)
backport fix to ensure that DSP is never enabled on pseudo channels
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@7641 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
-rw-r--r--channels/chan_zap.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 4a59a58f6..d591abd99 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -2959,6 +2959,9 @@ static void enable_dtmf_detect(struct zt_pvt *p)
int val;
#endif
+ if (p->channel == CHAN_PSEUDO)
+ return;
+
p->ignoredtmf = 0;
#ifdef ZT_TONEDETECT
@@ -5031,7 +5034,10 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
if (i->dsp) {
ast_log(LOG_DEBUG, "Already have a dsp on %s?\n", tmp->name);
} else {
- i->dsp = ast_dsp_new();
+ if (i->channel != CHAN_PSEUDO)
+ i->dsp = ast_dsp_new();
+ else
+ i->dsp = NULL;
if (i->dsp) {
i->dsp_features = features & ~DSP_PROGRESS_TALK;
#ifdef ZAPATA_PRI