kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 08:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
Review: https://reviewboard.asterisk.org/r/1754/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358730 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2012-03-10 20:06:46 +00:00
parent 4657b016ad
commit f5fda0eb74
8 changed files with 106 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/app_confbridge.c
View File

@@ -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)) {