aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-10 20:28:03 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-10 20:28:03 +0000
commitf6d318694e1e1389c864ef0eed500c1f3c4b779d (patch)
treeb3ff622b989e92b019a622d03ea24928e20f5e9f
parentb8bd2d1db39f19e1c878f6d623e9aca48d2e34cf (diff)
Uhm, make Zap actually work again. Did anybody actually test that code?
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@42654 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_zap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index ad3798646..4dc2f72fd 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -1822,7 +1822,7 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
set_actual_gain(p->subs[SUB_REAL].zfd, 0, p->rxgain, p->txgain, p->law);
mysig = p->sig;
- if (p->outsigmod)
+ if (p->outsigmod > -1)
mysig = p->outsigmod;
switch (mysig) {
@@ -3593,7 +3593,7 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
index = zt_get_index(ast, p, 0);
mysig = p->sig;
- if (p->outsigmod)
+ if (p->outsigmod > -1)
mysig = p->outsigmod;
p->subs[index].f.frametype = AST_FRAME_NULL;
p->subs[index].f.subclass = 0;
@@ -10448,7 +10448,7 @@ static int setup_zap(int reload)
finish = start;
start = x;
}
- if (cur_outsignalling < 0) cur_outsignalling = cur_signalling;
+
for (x = start; x <= finish; x++) {
#ifdef HAVE_PRI
tmp = mkintf(x, cur_signalling, cur_outsignalling, cur_radio, pri, reload);