[asterisk-commits] mmichelson: branch mmichelson/bridged_channel r395809 - /team/mmichelson/brid...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Jul 30 16:32:56 2013
New Revision: 395809

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395809
Log:
Get rid of ast_bridged_channel calls in app_chanspy.


Modified:
    team/mmichelson/bridged_channel/apps/app_chanspy.c

Modified: team/mmichelson/bridged_channel/apps/app_chanspy.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/bridged_channel/apps/app_chanspy.c?view=diff&rev=395809&r1=395808&r2=395809
==============================================================================
--- team/mmichelson/bridged_channel/apps/app_chanspy.c (original)
+++ team/mmichelson/bridged_channel/apps/app_chanspy.c Tue Jul 30 16:32:56 2013
@@ -637,12 +637,14 @@
 	}
 
 	if (ast_test_flag(flags, OPTION_BARGE | OPTION_DTMF_SWITCH_MODES)) {
+		RAII_VAR(struct ast_channel *, bridged, ast_channel_bridge_peer(spyee_autochan->chan), ast_channel_cleanup);
+
 		/* And this hook lets us inject audio into the channel that the spied on
 		   channel is currently bridged with.
 		*/
 		ast_audiohook_init(&csth.bridge_whisper_audiohook, AST_AUDIOHOOK_TYPE_WHISPER, "Chanspy", 0);
 
-		if ((spyee_bridge_autochan = ast_autochan_setup(ast_bridged_channel(spyee_autochan->chan)))) {
+		if ((spyee_bridge_autochan = ast_autochan_setup(bridged))) {
 			ast_channel_lock(spyee_bridge_autochan->chan);
 			if (start_spying(spyee_bridge_autochan, spyer_name, &csth.bridge_whisper_audiohook)) {
 				ast_log(LOG_WARNING, "Unable to attach barge audiohook on spyee %s. Barge mode disabled!\n", name);
@@ -935,7 +937,7 @@
 				break;
 			}
 
-			if (ast_test_flag(flags, OPTION_BRIDGED) && !ast_bridged_channel(autochan->chan)) {
+			if (ast_test_flag(flags, OPTION_BRIDGED) && !ast_channel_is_bridged(autochan->chan)) {
 				continue;
 			}