diff options
| author | Jonathan Rose <jrose@digium.com> | 2013-07-18 16:49:44 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2013-07-18 16:49:44 +0000 |
| commit | 81f36bee0f881259aa9313f3bb5c1049e8de038d (patch) | |
| tree | c4027c01445fd08c3a7a3e652652a34e8d5ffdb6 /main | |
| parent | c1a7567d24a08377438837ed26b1f8a886867c10 (diff) | |
bridge_holding/app_bridgewait: Add new entertainment options
This patch adds more entertainment options to holding bridges and the
bridge_wait application. Also, holding bridges will now use music on
hold as the default entertainment option instead of none. The
parameters for app_bridgewait have changed to (role, options) from
the previous (options) and the options themselves have changed as
well (entertainment options are now contained in an enumerator, role
specification is handled by the role parameter, etc)
(closes issue ASTERISK-21923)
Reported by: Matthew Jordan
Review: https://reviewboard.asterisk.org/r/2679/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@394731 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/bridging_roles.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/main/bridging_roles.c b/main/bridging_roles.c index 079cbdb33..a50ade406 100644 --- a/main/bridging_roles.c +++ b/main/bridging_roles.c @@ -371,9 +371,7 @@ int ast_channel_set_bridge_role_option(struct ast_channel *channel, const char * return 0; } - setup_bridge_role_option(role, option, value); - - return 0; + return setup_bridge_role_option(role, option, value); } int ast_bridge_channel_has_role(struct ast_bridge_channel *bridge_channel, const char *role_name) |