[asterisk-commits] oej: branch oej/applefrog-early-media-in-originate-trunk r342758 - /team/oej/...

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Oct 31 07:05:11 2011
New Revision: 342758

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=342758
Log:
Fixes based on the review by irroot - Thanks!

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

Modified: team/oej/applefrog-early-media-in-originate-trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/applefrog-early-media-in-originate-trunk/main/manager.c?view=diff&rev=342758&r1=342757&r2=342758
==============================================================================
--- team/oej/applefrog-early-media-in-originate-trunk/main/manager.c (original)
+++ team/oej/applefrog-early-media-in-originate-trunk/main/manager.c Mon Oct 31 07:05:11 2011
@@ -4099,7 +4099,7 @@
 
 	/* For originate async - we can bridge in early media stage */
 	bridgeearly = ast_true(earlymedia);
-	
+
 
 	if (ast_true(async)) {
 		struct fast_originate_helper *fast = ast_calloc(1, sizeof(*fast));

Modified: team/oej/applefrog-early-media-in-originate-trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/applefrog-early-media-in-originate-trunk/main/pbx.c?view=diff&rev=342758&r1=342757&r2=342758
==============================================================================
--- team/oej/applefrog-early-media-in-originate-trunk/main/pbx.c (original)
+++ team/oej/applefrog-early-media-in-originate-trunk/main/pbx.c Mon Oct 31 07:05:11 2011
@@ -8795,7 +8795,7 @@
 		if (chan) {
 			if (chan->_state == AST_STATE_UP || (earlymedia && *reason == AST_CONTROL_PROGRESS) ) {
 				res = 0;
-				ast_verb(4, "Channel %s was answered (or got early media).\n", chan->name);
+				ast_verb(4, "Channel %s %s\n", chan->name, chan->_state == AST_STATE_UP ? "was answered" : "got early media");
 
 				if (synchronous > 1) {
 					if (channel)