[asterisk-commits] rmudgett: branch 1.6.0 r189138 - in /branches/1.6.0: ./ channels/ channels/mi...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Apr 17 16:51:57 2009
New Revision: 189138

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=189138
Log:
Merged revisions 189137 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r189137 | rmudgett | 2009-04-17 16:48:10 -0500 (Fri, 17 Apr 2009) | 17 lines
  
  Merged revisions 188833,189134 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r188833 | rmudgett | 2009-04-16 16:37:58 -0500 (Thu, 16 Apr 2009) | 4 lines
    
    Only disable mISDN DSP if Asterisk DSP is enabled. Leave jitter setting alone.
    
    JIRA ABE-1835
  ........
    r189134 | rmudgett | 2009-04-17 16:27:55 -0500 (Fri, 17 Apr 2009) | 4 lines
    
    Modifed/added some debug messages.
    
    JIRA ABE-1835
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_misdn.c
    branches/1.6.0/channels/misdn/isdn_lib.c

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

Modified: branches/1.6.0/channels/chan_misdn.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/channels/chan_misdn.c?view=diff&rev=189138&r1=189137&r2=189138
==============================================================================
--- branches/1.6.0/channels/chan_misdn.c (original)
+++ branches/1.6.0/channels/chan_misdn.c Fri Apr 17 16:51:57 2009
@@ -5721,7 +5721,6 @@
 	if (ch->ast_dsp) {
 		chan_misdn_log(1, ch->bc->port, "SETOPT: with AST_DSP we deactivate mISDN_dsp\n");
 		ch->bc->nodsp = 1;
-		ch->bc->nojitter = 1;
 	}
 	
 	return 0;

Modified: branches/1.6.0/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/channels/misdn/isdn_lib.c?view=diff&rev=189138&r1=189137&r2=189138
==============================================================================
--- branches/1.6.0/channels/misdn/isdn_lib.c (original)
+++ branches/1.6.0/channels/misdn/isdn_lib.c Fri Apr 17 16:51:57 2009
@@ -2259,7 +2259,7 @@
 		flip_buf_bits( data, jlen);
 		
 		if (jlen < len) {
-			cb_log(7,bc->port,"Jitterbuffer Underrun.\n");
+			cb_log(1, bc->port, "Jitterbuffer Underrun. Got %d of expected %d\n", jlen, len);
 		}
 		
 		txfrm->prim = DL_DATA|REQUEST;
@@ -2295,11 +2295,16 @@
 		txfrm->addr = bc->addr|FLG_MSG_DOWN; /*  | IF_DOWN; */
 
 		txfrm->len =len;
-		cb_log(9, bc->port, "Transmitting %d samples 2 misdn\n", txfrm->len);
+		cb_log(5, bc->port, "Transmitting %d samples of silence to misdn\n", len);
 
 		r=mISDN_write( glob_mgr->midev, buf, txfrm->len + mISDN_HEADER_LEN, 8000 );
+#else
+		r = 0;
 #endif
-
+	}
+
+	if (r < 0) {
+		cb_log(1, bc->port, "Error in mISDN_write (%s)\n", strerror(errno));
 	}
 }