[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r319007 - in /team/irroot/di...

[SVN commits to the Asterisk project]

Author: irroot
Date: Sat May 14 13:52:43 2011
New Revision: 319007

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=319007
Log:
Allow setting pickupgroup on channl via CHANNEL()

RB:1118
#19045


Modified:
    team/irroot/distrotech-customers-trunk/   (props changed)
    team/irroot/distrotech-customers-trunk/cel/cel_odbc.c   (props changed)
    team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample   (props changed)
    team/irroot/distrotech-customers-trunk/main/channel.c
    team/irroot/distrotech-customers-trunk/sounds/Makefile   (props changed)

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 14 13:52:43 2011
@@ -1,3 +1,3 @@
 /team/irroot/app_queue-trunk:318983-319002
-/team/irroot/distrotech-customers:318992-318994
+/team/irroot/distrotech-customers:318992-318995
 /team/irroot/t38gateway-trunk:318974-319002

Propchange: team/irroot/distrotech-customers-trunk/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 14 13:52:43 2011
@@ -1,4 +1,4 @@
 /be/branches/C.3/cel/cel_adaptive_odbc.c:256426
 /team/irroot/app_queue-trunk/cel/cel_odbc.c:318983-319002
-/team/irroot/distrotech-customers/cel/cel_odbc.c:318992-318994
+/team/irroot/distrotech-customers/cel/cel_odbc.c:318992-318995
 /team/irroot/t38gateway-trunk/cel/cel_odbc.c:318974-319002

Propchange: team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 14 13:52:43 2011
@@ -1,4 +1,4 @@
 /be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
 /team/irroot/app_queue-trunk/configs/cel_odbc.conf.sample:318983-319002
-/team/irroot/distrotech-customers/configs/cel_odbc.conf.sample:318992-318994
+/team/irroot/distrotech-customers/configs/cel_odbc.conf.sample:318992-318995
 /team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318974-319002

Modified: team/irroot/distrotech-customers-trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/main/channel.c?view=diff&rev=319007&r1=319006&r2=319007
==============================================================================
--- team/irroot/distrotech-customers-trunk/main/channel.c (original)
+++ team/irroot/distrotech-customers-trunk/main/channel.c Sat May 14 13:52:43 2011
@@ -7275,6 +7275,7 @@
 	long time_left_ms=0;
 	char caller_warning = 0;
 	char callee_warning = 0;
+	const char *bridge_macro,*bridge_macro_args;
 
 	if (c0->_bridge) {
 		ast_log(LOG_WARNING, "%s is already in a bridge with %s\n",
@@ -7354,6 +7355,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(NULL, 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(NULL, c0, bridge_macro, bridge_macro_args);
+	}
 
 	for (/* ever */;;) {
 		struct timeval now = { 0, };

Propchange: team/irroot/distrotech-customers-trunk/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 14 13:52:43 2011
@@ -1,5 +1,5 @@
 /be/branches/C.3/sounds/Makefile:256426
 /team/irroot/app_queue-trunk/sounds/Makefile:318983-319002
-/team/irroot/distrotech-customers/sounds/Makefile:318992-318994
+/team/irroot/distrotech-customers/sounds/Makefile:318992-318995
 /team/irroot/t38gateway-trunk/sounds/Makefile:318974-319002
 /trunk/sounds/Makefile:270974