[asterisk-commits] oej: branch oej/applefrog-early-media-in-originate-1.4 r316192 - /team/oej/ap...

[SVN commits to the Asterisk project]

Author: oej
Date: Tue May  3 05:34:46 2011
New Revision: 316192

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316192
Log:
Final cleaning up

Modified:
    team/oej/applefrog-early-media-in-originate-1.4/main/channel.c
    team/oej/applefrog-early-media-in-originate-1.4/main/manager.c
    team/oej/applefrog-early-media-in-originate-1.4/main/pbx.c

Modified: team/oej/applefrog-early-media-in-originate-1.4/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/applefrog-early-media-in-originate-1.4/main/channel.c?view=diff&rev=316192&r1=316191&r2=316192
==============================================================================
--- team/oej/applefrog-early-media-in-originate-1.4/main/channel.c (original)
+++ team/oej/applefrog-early-media-in-originate-1.4/main/channel.c Tue May  3 05:34:46 2011
@@ -3674,7 +3674,6 @@
 				/* Ignore these */
 				case AST_CONTROL_PROGRESS:
 					if (oh->connect_on_earlymedia) {
-						ast_log(LOG_DEBUG, " --->>> AST_CONTROL_PROGRESS here!\n");
 						*outstate = f->subclass;
 						timeout = 0;		/* trick to force exit from the while() */
 						break;

Modified: team/oej/applefrog-early-media-in-originate-1.4/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/applefrog-early-media-in-originate-1.4/main/manager.c?view=diff&rev=316192&r1=316191&r2=316192
==============================================================================
--- team/oej/applefrog-early-media-in-originate-1.4/main/manager.c (original)
+++ team/oej/applefrog-early-media-in-originate-1.4/main/manager.c Tue May  3 05:34:46 2011
@@ -1952,7 +1952,7 @@
 "	Variable: Channel variable to set, multiple Variable: headers are allowed\n"
 "	Codecs: Comma-separated list of codecs to use for the new channels\n"
 "	Account: Account code\n"
-"	Earlymedia: Set to 'true' to force bridge on early media (only works in async mode)\n"
+"	Earlymedia: Set to 'true' to force bridge on early media\n"
 "	Async: Set to 'true' for fast origination\n";
 
 static int action_originate(struct mansession *s, const struct message *m)

Modified: team/oej/applefrog-early-media-in-originate-1.4/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/applefrog-early-media-in-originate-1.4/main/pbx.c?view=diff&rev=316192&r1=316191&r2=316192
==============================================================================
--- team/oej/applefrog-early-media-in-originate-1.4/main/pbx.c (original)
+++ team/oej/applefrog-early-media-in-originate-1.4/main/pbx.c Tue May  3 05:34:46 2011
@@ -5030,7 +5030,6 @@
 	struct ast_frame *f;
 	struct ast_app *app;
 	int haveearlymedia = 0;
-	int checkearlymedia = as->earlymedia;
 
 	while (timeout && (chan->_state != AST_STATE_UP)) {
 		res = ast_waitfor(chan, timeout);
@@ -5047,7 +5046,7 @@
 				ast_frfree(f);
 				break;
 			}
-			if (as->earlymedia && f->subclass == AST_CONTROL_PROGRESS && checkearlymedia) {
+			if (as->earlymedia && f->subclass == AST_CONTROL_PROGRESS) {
 				haveearlymedia = 1;
 				break;
 			}