[svn-commits] kpfleming: branch 1.4 r2753 - in /branches/1.4: ./ zaptel-base.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Wed Jul 18 20:05:35 2007
New Revision: 2753

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2753
Log:
Merged revisions 2752 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2752 | kpfleming | 2007-07-18 20:02:53 -0500 (Wed, 18 Jul 2007) | 2 lines

don't try to timeslot-interchange channels that are being bridged (DACS) if either channel has a txgain or rxgain specified, since that gain won't be applied any longer if the DACS is put into effect

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/zaptel-base.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/zaptel-base.c?view=diff&rev=2753&r1=2752&r2=2753
==============================================================================
--- branches/1.4/zaptel-base.c (original)
+++ branches/1.4/zaptel-base.c Wed Jul 18 20:05:35 2007
@@ -3970,8 +3970,13 @@
 		zt_check_conf(j);
 		zt_check_conf(stack.conf.confno);
 		if (chans[i]->span && chans[i]->span->dacs) {
-			if (((stack.conf.confmode & ZT_CONF_MODE_MASK) == ZT_CONF_DIGITALMON) && chans[stack.conf.confno]->span &&
-					(chans[stack.conf.confno]->span->dacs == chans[i]->span->dacs)) {
+			if (((stack.conf.confmode & ZT_CONF_MODE_MASK) == ZT_CONF_DIGITALMON) &&
+			    chans[stack.conf.confno]->span &&
+			    chans[stack.conf.confno]->span->dacs == chans[i]->span->dacs &&
+			    chans[i]->txgain == defgain &&
+			    chans[i]->rxgain == defgain &&
+			    chans[stack.conf.confno]->txgain == defgain &&
+			    chans[stack.conf.confno]->rxgain == defgain) {
 				chans[i]->span->dacs(chans[i], chans[stack.conf.confno]);
 			} else {
 				chans[i]->span->dacs(chans[i], NULL);