[asterisk-commits] mmichelson: branch mmichelson/issue11259 r135798 - /team/mmichelson/issue1125...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Aug  5 17:58:35 2008
New Revision: 135798

URL: http://svn.digium.com/view/asterisk?view=rev&rev=135798
Log:
1. Remove debug messages
2. Remove fixed jb reset stub. It's apparently not necessary.

Next to run some tests to make sure there are no memory leaks, etc.


Modified:
    team/mmichelson/issue11259/main/abstract_jb.c
    team/mmichelson/issue11259/main/channel.c
    team/mmichelson/issue11259/main/file.c
    team/mmichelson/issue11259/main/fixedjitterbuf.c

Modified: team/mmichelson/issue11259/main/abstract_jb.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/issue11259/main/abstract_jb.c?view=diff&rev=135798&r1=135797&r2=135798
==============================================================================
--- team/mmichelson/issue11259/main/abstract_jb.c (original)
+++ team/mmichelson/issue11259/main/abstract_jb.c Tue Aug  5 17:58:35 2008
@@ -725,8 +725,6 @@
 	while (fixed_jb_remove(fixedjb, &f) == FIXED_JB_OK) {
 		ast_frfree(f.data);
 	}
-
-	fixed_jb_reset(fixedjb);
 }
 
 /* adaptive */

Modified: team/mmichelson/issue11259/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/issue11259/main/channel.c?view=diff&rev=135798&r1=135797&r2=135798
==============================================================================
--- team/mmichelson/issue11259/main/channel.c (original)
+++ team/mmichelson/issue11259/main/channel.c Tue Aug  5 17:58:35 2008
@@ -3841,7 +3841,6 @@
 			case AST_CONTROL_SRCUPDATE:
 				ast_indicate_data(other, f->subclass, f->data, f->datalen);
 				if (jb_in_use) {
-					ast_log(LOG_NOTICE, "I should be emptying and resetting the freaking jitterbuffer...\n");
 					ast_jb_empty_and_reset(c0, c1);
 				}
 				break;
@@ -3894,7 +3893,6 @@
 		cs[0] = cs[1];
 		cs[1] = cs[2];
 	}
-	ast_log(LOG_NOTICE, "Curious....when do we return from here?\n");
 	return res;
 }
 

Modified: team/mmichelson/issue11259/main/file.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/issue11259/main/file.c?view=diff&rev=135798&r1=135797&r2=135798
==============================================================================
--- team/mmichelson/issue11259/main/file.c (original)
+++ team/mmichelson/issue11259/main/file.c Tue Aug  5 17:58:35 2008
@@ -901,7 +901,6 @@
 			return -1;
 		if (vfs && ast_applystream(chan, vfs))
 			return -1;
-		ast_queue_control(chan, AST_CONTROL_SRCUPDATE);
 		res = ast_playstream(fs);
 		if (!res && vfs)
 			res = ast_playstream(vfs);

Modified: team/mmichelson/issue11259/main/fixedjitterbuf.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/issue11259/main/fixedjitterbuf.c?view=diff&rev=135798&r1=135797&r2=135798
==============================================================================
--- team/mmichelson/issue11259/main/fixedjitterbuf.c (original)
+++ team/mmichelson/issue11259/main/fixedjitterbuf.c Tue Aug  5 17:58:35 2008
@@ -349,7 +349,3 @@
 	
 	return FIXED_JB_OK;
 }
-
-void fixed_jb_reset(struct fixed_jb *jb)
-{
-}