[asterisk-commits] jpeeler: branch 1.6.0 r232092 - in /branches/1.6.0: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Dec  1 18:49:29 2009
New Revision: 232092

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=232092
Log:
Merged revisions 232091 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r232091 | jpeeler | 2009-12-01 18:45:18 -0600 (Tue, 01 Dec 2009) | 17 lines
  
  Merged revisions 232090 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r232090 | jpeeler | 2009-12-01 18:42:58 -0600 (Tue, 01 Dec 2009) | 10 lines
    
    Do not modify the gain settings on data calls.
    
    (The digital flag actually represents a data call.)
    
    (closes issue #15972)
    Reported by: udosw
    Patches: 
          transcap_digital_fix.diff.txt uploaded by alecdavis (license 585)
    Tested by: alecdavis
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_dahdi.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=232092&r1=232091&r2=232092
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Tue Dec  1 18:49:29 2009
@@ -2461,7 +2461,11 @@
 		ast_log(LOG_WARNING, "Unable to flush input on channel %d: %s\n", p->channel, strerror(errno));
 	p->outgoing = 1;
 
-	set_actual_gain(p->subs[SUB_REAL].dfd, 0, p->rxgain, p->txgain, p->law);
+	if (IS_DIGITAL(ast->transfercapability)){
+		set_actual_gain(p->subs[SUB_REAL].dfd, 0, 0, 0, p->law);
+	} else {
+		set_actual_gain(p->subs[SUB_REAL].dfd, 0, p->rxgain, p->txgain, p->law);
+	}	
 
 	mysig = p->sig;
 	if (p->outsigmod > -1)