[asterisk-commits] rmudgett: branch rmudgett/stasis_linkedids r418138 - in /team/rmudgett/stasis...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Jul  7 14:13:29 2014
New Revision: 418138

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418138
Log:
res_stasis: Add conference to the list of bridge mixing flags.

Modified:
    team/rmudgett/stasis_linkedids/res/ari/resource_bridges.h
    team/rmudgett/stasis_linkedids/res/res_stasis.c
    team/rmudgett/stasis_linkedids/res/stasis/stasis_bridge.h
    team/rmudgett/stasis_linkedids/rest-api/api-docs/bridges.json

Modified: team/rmudgett/stasis_linkedids/res/ari/resource_bridges.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/stasis_linkedids/res/ari/resource_bridges.h?view=diff&rev=418138&r1=418137&r2=418138
==============================================================================
--- team/rmudgett/stasis_linkedids/res/ari/resource_bridges.h (original)
+++ team/rmudgett/stasis_linkedids/res/ari/resource_bridges.h Mon Jul  7 14:13:29 2014
@@ -52,7 +52,7 @@
 void ast_ari_bridges_list(struct ast_variable *headers, struct ast_ari_bridges_list_args *args, struct ast_ari_response *response);
 /*! Argument struct for ast_ari_bridges_create() */
 struct ast_ari_bridges_create_args {
-	/*! Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media). */
+	/*! Comma separated list of bridge type attributes (mixing, holding, conference, dtmf_events, proxy_media). */
 	const char *type;
 	/*! Unique ID to give to the bridge being created. */
 	const char *bridge_id;
@@ -82,7 +82,7 @@
 void ast_ari_bridges_create(struct ast_variable *headers, struct ast_ari_bridges_create_args *args, struct ast_ari_response *response);
 /*! Argument struct for ast_ari_bridges_create_or_update_with_id() */
 struct ast_ari_bridges_create_or_update_with_id_args {
-	/*! Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media) to set. */
+	/*! Comma separated list of bridge type attributes (mixing, holding, conference, dtmf_events, proxy_media) to set. */
 	const char *type;
 	/*! Unique ID to give to the bridge being created. */
 	const char *bridge_id;

Modified: team/rmudgett/stasis_linkedids/res/res_stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/stasis_linkedids/res/res_stasis.c?view=diff&rev=418138&r1=418137&r2=418138
==============================================================================
--- team/rmudgett/stasis_linkedids/res/res_stasis.c (original)
+++ team/rmudgett/stasis_linkedids/res/res_stasis.c Mon Jul  7 14:13:29 2014
@@ -692,6 +692,11 @@
 			flags |= AST_BRIDGE_FLAG_SMART;
 		} else if (!strcmp(requested_type, "holding")) {
 			capabilities |= AST_BRIDGE_CAPABILITY_HOLDING;
+			flags &= ~AST_BRIDGE_FLAG_SMART;
+		} else if (!strcmp(requested_type, "conference")) {
+			capabilities &= ~(STASIS_BRIDGE_MIXING_CAPABILITIES
+				& ~AST_BRIDGE_CAPABILITY_MULTIMIX);
+			flags &= ~AST_BRIDGE_FLAG_SMART;
 		} else if (!strcmp(requested_type, "dtmf_events") ||
 			!strcmp(requested_type, "proxy_media")) {
 			capabilities &= ~AST_BRIDGE_CAPABILITY_NATIVE;

Modified: team/rmudgett/stasis_linkedids/res/stasis/stasis_bridge.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/stasis_linkedids/res/stasis/stasis_bridge.h?view=diff&rev=418138&r1=418137&r2=418138
==============================================================================
--- team/rmudgett/stasis_linkedids/res/stasis/stasis_bridge.h (original)
+++ team/rmudgett/stasis_linkedids/res/stasis/stasis_bridge.h Mon Jul  7 14:13:29 2014
@@ -37,9 +37,9 @@
 
 /*! Normal capabilities of mixing bridges */
 #define STASIS_BRIDGE_MIXING_CAPABILITIES	\
-	(AST_BRIDGE_CAPABILITY_1TO1MIX \
-	| AST_BRIDGE_CAPABILITY_MULTIMIX \
-	| AST_BRIDGE_CAPABILITY_NATIVE)
+	(AST_BRIDGE_CAPABILITY_NATIVE \
+	| AST_BRIDGE_CAPABILITY_1TO1MIX \
+	| AST_BRIDGE_CAPABILITY_MULTIMIX)
 
 /*!
  * \internal

Modified: team/rmudgett/stasis_linkedids/rest-api/api-docs/bridges.json
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/stasis_linkedids/rest-api/api-docs/bridges.json?view=diff&rev=418138&r1=418137&r2=418138
==============================================================================
--- team/rmudgett/stasis_linkedids/rest-api/api-docs/bridges.json (original)
+++ team/rmudgett/stasis_linkedids/rest-api/api-docs/bridges.json Mon Jul  7 14:13:29 2014
@@ -26,7 +26,7 @@
 					"parameters": [
 						{
 							"name": "type",
-							"description": "Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media).",
+							"description": "Comma separated list of bridge type attributes (mixing, holding, conference, dtmf_events, proxy_media).",
 							"paramType": "query",
 							"required": false,
 							"allowMultiple": false,
@@ -65,7 +65,7 @@
 					"parameters": [
 						{
 							"name": "type",
-							"description": "Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media) to set.",
+							"description": "Comma separated list of bridge type attributes (mixing, holding, conference, dtmf_events, proxy_media) to set.",
 							"paramType": "query",
 							"required": false,
 							"allowMultiple": false,