diff options
| author | Joshua Colp <jcolp@digium.com> | 2012-03-10 20:06:46 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2012-03-10 20:06:46 +0000 |
| commit | f5fda0eb74e4653282a2f5b25aa187c3ad16fe47 (patch) | |
| tree | 213b917ef9945475139d4a407f3f454568930b7a /apps/app_confbridge.c | |
| parent | 4657b016ad8250c999f3fad110edf0a1f8c74acd (diff) | |
Transition app_page to using app_confbridge internally for the conference bridge portion of paging. This also adds a new 'announcement' option to ConfBridge user profiles.
Review: https://reviewboard.asterisk.org/r/1754/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358730 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_confbridge.c')
| -rw-r--r-- | apps/app_confbridge.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index b5b27ed2f..89c4354b3 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -997,6 +997,17 @@ static struct conference_bridge *join_conference_bridge(const char *name, struct ast_devstate_changed(AST_DEVICE_INUSE, "confbridge:%s", conference_bridge->name); } + /* If an announcement is to be played play it */ + if (!ast_strlen_zero(conference_bridge_user->u_profile.announcement)) { + if (play_prompt_to_channel(conference_bridge, + conference_bridge_user->chan, + conference_bridge_user->u_profile.announcement)) { + ao2_unlock(conference_bridge); + leave_conference_bridge(conference_bridge, conference_bridge_user); + return NULL; + } + } + /* If the caller is a marked user or is waiting for a marked user to enter pass 'em off, otherwise pass them off to do regular joining stuff */ if (ast_test_flag(&conference_bridge_user->u_profile, USER_OPT_MARKEDUSER | USER_OPT_WAITMARKED)) { if (post_join_marked(conference_bridge, conference_bridge_user)) { |