[asterisk-commits] markster: branch markster/usersconf r42655 - /team/markster/usersconf/channels/

[asterisk-commits at lists.digium.com]

Author: markster
Date: Sun Sep 10 15:28:29 2006
New Revision: 42655

URL: http://svn.digium.com/view/asterisk?rev=42655&view=rev
Log:
Fix breakage in zap from broken outsignalling nonsense.

Modified:
    team/markster/usersconf/channels/chan_zap.c

Modified: team/markster/usersconf/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/markster/usersconf/channels/chan_zap.c?rev=42655&r1=42654&r2=42655&view=diff
==============================================================================
--- team/markster/usersconf/channels/chan_zap.c (original)
+++ team/markster/usersconf/channels/chan_zap.c Sun Sep 10 15:28:29 2006
@@ -1823,7 +1823,7 @@
 	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) {
@@ -3594,7 +3594,7 @@
 
 	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;
@@ -10346,7 +10346,7 @@
 			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);