[asterisk-commits] branch oej/jitterbuffer-1.2 r12652 - /team/oej/jitterbuffer-1.2/channel.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Sun Mar 12 14:00:06 2006
New Revision: 12652

URL: http://svn.digium.com/view/asterisk?rev=12652&view=rev
Log:
Fix for channel.c (thanks royk)

Modified:
    team/oej/jitterbuffer-1.2/channel.c

Modified: team/oej/jitterbuffer-1.2/channel.c
URL: http://svn.digium.com/view/asterisk/team/oej/jitterbuffer-1.2/channel.c?rev=12652&r1=12651&r2=12652&view=diff
==============================================================================
--- team/oej/jitterbuffer-1.2/channel.c (original)
+++ team/oej/jitterbuffer-1.2/channel.c Sun Mar 12 14:00:06 2006
@@ -3269,14 +3269,13 @@
 #ifdef AST_JB
 		/* Calculate the appropriate max sleep interval - in general, this is the time,
 		   left to the closest jb delivery moment */
-		to = ast_jb_get_when_to_wakeup(c0, c1, &to);
+		to = ast_jb_get_when_to_wakeup(c0, c1, to);
 #endif /* AST_JB */
 		if (!who) {
 #ifdef AST_JB
 			/* No frame received within the specified timeout - check if we have to deliver now */
 			ast_jb_get_and_deliver(c0, c1);
 #endif /* AST_JB */
-		if (!who) {
 			ast_log(LOG_DEBUG, "Nobody there, continuing...\n"); 
 			if (c0->_softhangup == AST_SOFTHANGUP_UNBRIDGE || c1->_softhangup == AST_SOFTHANGUP_UNBRIDGE) {
 				if (c0->_softhangup == AST_SOFTHANGUP_UNBRIDGE)