[svn-commits] irroot: branch irroot/distrotech-customers-10 r333486 - /team/irroot/distrote...

[SVN commits to the Digium repositories]

Author: irroot
Date: Sat Aug 27 04:00:01 2011
New Revision: 333486

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=333486
Log:
app_directed_pickup Implement the ability to remove a channel group on bridged channel RB118

Modified:
    team/irroot/distrotech-customers-10/main/channel.c

Modified: team/irroot/distrotech-customers-10/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/main/channel.c?view=diff&rev=333486&r1=333485&r2=333486
==============================================================================
--- team/irroot/distrotech-customers-10/main/channel.c (original)
+++ team/irroot/distrotech-customers-10/main/channel.c Sat Aug 27 04:00:01 2011
@@ -7346,6 +7346,8 @@
 	long time_left_ms=0;
 	char caller_warning = 0;
 	char callee_warning = 0;
+	const char *bridge_macro;
+	const char *bridge_macro_args;
 
 	*fo = NULL;
 
@@ -7424,6 +7426,17 @@
 	/* Before we enter in and bridge these two together tell them both the source of audio has changed */
 	ast_indicate(c0, AST_CONTROL_SRCUPDATE);
 	ast_indicate(c1, AST_CONTROL_SRCUPDATE);
+
+	bridge_macro = pbx_builtin_getvar_helper(c0, "PICKUP_BRIDGE_MACRO");
+	if (!ast_strlen_zero(bridge_macro)) {
+		bridge_macro_args = pbx_builtin_getvar_helper(c0, "PICKUP_BRIDGE_MACRO_ARGS");
+		ast_app_run_macro(c0, c1, bridge_macro, bridge_macro_args);
+	}
+	bridge_macro = pbx_builtin_getvar_helper(c1, "PICKUP_BRIDGE_MACRO");
+	if (!ast_strlen_zero(bridge_macro)) {
+		bridge_macro_args = pbx_builtin_getvar_helper(c1, "PICKUP_BRIDGE_MACRO_ARGS");
+		ast_app_run_macro(c1, c0, bridge_macro, bridge_macro_args);
+	}
 
 	for (/* ever */;;) {
 		struct timeval now = { 0, };