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
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@232093 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index d2a4df3800eba7c95ed05dc1ac0bd9865f84d0f5..8ff1620fa9d636d35dacc7a8191557750ede68d4 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -2476,7 +2476,11 @@ static int dahdi_call(struct ast_channel *ast, char *rdest, int timeout)
                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)