[svn-commits] rmudgett: branch rmudgett/bridge_phase r382269 - /team/rmudgett/bridge_phase/...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu Feb 28 12:27:54 2013
New Revision: 382269

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382269
Log:
Remove format id from bridging debug messages.

Modified:
    team/rmudgett/bridge_phase/main/bridging.c

Modified: team/rmudgett/bridge_phase/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/main/bridging.c?view=diff&rev=382269&r1=382268&r2=382269
==============================================================================
--- team/rmudgett/bridge_phase/main/bridging.c (original)
+++ team/rmudgett/bridge_phase/main/bridging.c Thu Feb 28 12:27:54 2013
@@ -1057,6 +1057,7 @@
 static int bridge_make_compatible(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel)
 {
 	struct ast_format formats[2];
+
 	ast_format_copy(&formats[0], ast_channel_readformat(bridge_channel->chan));
 	ast_format_copy(&formats[1], ast_channel_writeformat(bridge_channel->chan));
 
@@ -1751,23 +1752,23 @@
 
 	/* Restore original formats of the channel as they came in */
 	if (ast_format_cmp(ast_channel_readformat(bridge_channel->chan), &formats[0]) == AST_FORMAT_CMP_NOT_EQUAL) {
-		ast_debug(1, "Bridge is returning bridge channel %p(%s) to read format %s(%d)\n",
+		ast_debug(1, "Bridge is returning bridge channel %p(%s) to read format %s\n",
 			bridge_channel, ast_channel_name(bridge_channel->chan),
-			ast_getformatname(&formats[0]), formats[0].id);
+			ast_getformatname(&formats[0]));
 		if (ast_set_read_format(bridge_channel->chan, &formats[0])) {
-			ast_debug(1, "Bridge failed to return bridge channel %p(%s) to read format %s(%d)\n",
+			ast_debug(1, "Bridge failed to return bridge channel %p(%s) to read format %s\n",
 				bridge_channel, ast_channel_name(bridge_channel->chan),
-				ast_getformatname(&formats[0]), formats[0].id);
+				ast_getformatname(&formats[0]));
 		}
 	}
 	if (ast_format_cmp(ast_channel_writeformat(bridge_channel->chan), &formats[1]) == AST_FORMAT_CMP_NOT_EQUAL) {
-		ast_debug(1, "Bridge is returning bridge channel %p(%s) to write format %s(%d)\n",
+		ast_debug(1, "Bridge is returning bridge channel %p(%s) to write format %s\n",
 			bridge_channel, ast_channel_name(bridge_channel->chan),
-			ast_getformatname(&formats[1]), formats[1].id);
+			ast_getformatname(&formats[1]));
 		if (ast_set_write_format(bridge_channel->chan, &formats[1])) {
-			ast_debug(1, "Bridge failed to return bridge channel %p(%s) to write format %s(%d)\n",
+			ast_debug(1, "Bridge failed to return bridge channel %p(%s) to write format %s\n",
 				bridge_channel, ast_channel_name(bridge_channel->chan),
-				ast_getformatname(&formats[1]), formats[1].id);
+				ast_getformatname(&formats[1]));
 		}
 	}
 }