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

[SVN commits to the Asterisk project]

Author: irroot
Date: Sat May 14 13:49:53 2011
New Revision: 319006

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=319006
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/funcs/func_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:49:53 2011
@@ -1,3 +1,3 @@
 /team/irroot/app_queue-trunk:318983-319002
-/team/irroot/distrotech-customers:318992-318993
+/team/irroot/distrotech-customers:318992-318994
 /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:49:53 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-318993
+/team/irroot/distrotech-customers/cel/cel_odbc.c:318992-318994
 /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:49:53 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-318993
+/team/irroot/distrotech-customers/configs/cel_odbc.conf.sample:318992-318994
 /team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318974-319002

Modified: team/irroot/distrotech-customers-trunk/funcs/func_channel.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/funcs/func_channel.c?view=diff&rev=319006&r1=319005&r2=319006
==============================================================================
--- team/irroot/distrotech-customers-trunk/funcs/func_channel.c (original)
+++ team/irroot/distrotech-customers-trunk/funcs/func_channel.c Sat May 14 13:49:53 2011
@@ -85,6 +85,9 @@
 					<enum name="callgroup">
 						<para>R/W call groups for call pickup.</para>
 					</enum>
+					<enum name="pickupgroup">
+						<para>R/W call groups for call pickup.</para>
+					</enum>
 					<enum name="channeltype">
 						<para>R/O technology used for channel.</para>
 					</enum>
@@ -372,6 +375,9 @@
 	} else if (!strcasecmp(data, "callgroup")) {
 		char groupbuf[256];
 		locked_copy_string(chan, buf,  ast_print_group(groupbuf, sizeof(groupbuf), chan->callgroup), len);
+	} else if (!strcasecmp(data, "pickupgroup")) {
+		char groupbuf[256];
+		locked_copy_string(chan, buf,  ast_print_group(groupbuf, sizeof(groupbuf), chan->pickupgroup), len);
 	} else if (!strcasecmp(data, "amaflags")) {
 		char amabuf[256];
 		snprintf(amabuf,sizeof(amabuf), "%d", chan->amaflags);
@@ -457,9 +463,11 @@
 			ast_channel_unlock(chan);
 			new_zone = ast_tone_zone_unref(new_zone);
 		}
-	} else if (!strcasecmp(data, "callgroup"))
+	} else if (!strcasecmp(data, "callgroup")) {
 		chan->callgroup = ast_get_group(value);
-	else if (!strcasecmp(data, "txgain")) {
+	} else if (!strcasecmp(data, "pickupgroup")) {
+		chan->pickupgroup = ast_get_group(value);
+	} else if (!strcasecmp(data, "txgain")) {
 		sscanf(value, "%4hhd", &gainset);
 		ast_channel_setoption(chan, AST_OPTION_TXGAIN, &gainset, sizeof(gainset), 0);
 	} else if (!strcasecmp(data, "rxgain")) {

Propchange: team/irroot/distrotech-customers-trunk/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 14 13:49:53 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-318993
+/team/irroot/distrotech-customers/sounds/Makefile:318992-318994
 /team/irroot/t38gateway-trunk/sounds/Makefile:318974-319002
 /trunk/sounds/Makefile:270974