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

[SVN commits to the Asterisk project]

Author: oej
Date: Tue May  3 04:10:15 2011
New Revision: 316191

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316191
Log:
Cleaning up

Modified:
    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/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/applefrog-early-media-in-originate-1.4/main/manager.c?view=diff&rev=316191&r1=316190&r2=316191
==============================================================================
--- 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 04:10:15 2011
@@ -1895,7 +1895,6 @@
 	int reason = 0;
 	struct ast_channel *chan = NULL;
 	char requested_channel[AST_CHANNEL_NAME];
-	ast_log(LOG_DEBUG, "-----> Earlymedia: %s\n", in->earlymedia ? "On" : "off");
 
 	if (!ast_strlen_zero(in->app)) {
 		res = ast_pbx_outgoing_app(in->tech, in->format, in->data, in->timeout, in->app, in->appdata, &reason, 1, 
@@ -2035,10 +2034,6 @@
 		if (!fast) {
 			res = -1;
 		} else {
-			if (option_debug) {
-				ast_log(LOG_DEBUG, "-----> Early media: %s\n", bridgeearly ? "on" : "off");
-			}
-
 			if (!ast_strlen_zero(id))
 				snprintf(fast->idtext, sizeof(fast->idtext), "ActionID: %s", id);
 			ast_copy_string(fast->tech, tech, sizeof(fast->tech));

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=316191&r1=316190&r2=316191
==============================================================================
--- 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 04:10:15 2011
@@ -5032,10 +5032,6 @@
 	int haveearlymedia = 0;
 	int checkearlymedia = as->earlymedia;
 
-	if (option_debug) {
-		ast_log(LOG_DEBUG, "----> Checkearlymedia %s\n", checkearlymedia ? "on" : "Off");
-	}
-
 	while (timeout && (chan->_state != AST_STATE_UP)) {
 		res = ast_waitfor(chan, timeout);
 		if (res < 1)
@@ -5059,8 +5055,8 @@
 		ast_frfree(f);
 	}
 	if (chan->_state == AST_STATE_UP || haveearlymedia) {
-		if (haveearlymedia && option_debug) {
-			ast_log(LOG_DEBUG, "----> Launching second call leg, since we have early media \n");
+		if (haveearlymedia && option_debug > 1) {
+			ast_log(LOG_DEBUG, "Activating pbx since we have early media \n");
 		}
 		if (!ast_strlen_zero(as->app)) {
 			app = pbx_findapp(as->app);
@@ -5132,11 +5128,9 @@
 	pthread_attr_t attr;
 
 
-	ast_log(LOG_DEBUG, "-----> Earlymedia: %s\n", earlymedia ? "On" : "off");
 	oh.connect_on_earlymedia = earlymedia;
 
 	if (sync) {
-		ast_log(LOG_DEBUG, "-----> Sync originate \n");
 		LOAD_OH(oh);
 		chan = __ast_request_and_dial(type, format, data, timeout, reason, cid_num, cid_name, &oh);
 		if (channel) {
@@ -5145,9 +5139,6 @@
 				ast_channel_lock(chan);
 		}
 		if (chan) {
-			if (earlymedia && *reason == AST_CONTROL_PROGRESS) {
-				ast_log(LOG_DEBUG, "-----> Sync originate: Yes, we have early media \n");
-			}
 			if (chan->_state == AST_STATE_UP || (earlymedia && *reason == AST_CONTROL_PROGRESS)) {
 				res = 0;
 				if (option_verbose > 3)
@@ -5229,7 +5220,6 @@
 			}
 		}
 	} else {
-		ast_log(LOG_DEBUG, "-----> Async originate \n");
 		if (!(as = ast_calloc(1, sizeof(*as)))) {
 			res = -1;
 			goto outgoing_exten_cleanup;
@@ -5242,7 +5232,6 @@
 				ast_channel_lock(chan);
 		}
 		if (!chan) {
-			ast_log(LOG_DEBUG, "-----> Failure: Async originate \n");
 			free(as);
 			res = -1;
 			goto outgoing_exten_cleanup;