diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-19 01:05:35 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-19 01:05:35 +0000 |
| commit | 0177232aac97bd599a0708ab31e39c62870da75c (patch) | |
| tree | 4d431362f815440c84a288bc5f56ddd537ea42d3 /zaptel-base.c | |
| parent | 3a977500cfddd2adc7949e31b0e7e4391b63b2a1 (diff) | |
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
........
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@2753 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'zaptel-base.c')
| -rw-r--r-- | zaptel-base.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/zaptel-base.c b/zaptel-base.c index 9955004..b956879 100644 --- a/zaptel-base.c +++ b/zaptel-base.c @@ -3970,8 +3970,13 @@ static int zt_chanandpseudo_ioctl(struct inode *inode, struct file *file, unsign 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); |