kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +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

5
apps/confbridge/conf_config_parser.c
View File

@@ -187,6 +187,8 @@ static int set_user_option(const char *name, const char *value, struct user_prof
ast_copy_string(u_profile->pin, value, sizeof(u_profile->pin));
} else if (!strcasecmp(name, "music_on_hold_class")) {
ast_copy_string(u_profile->moh_class, value, sizeof(u_profile->moh_class));
} else if (!strcasecmp(name, "announcement")) {
ast_copy_string(u_profile->announcement, value, sizeof(u_profile->announcement));
} else if (!strcasecmp(name, "denoise")) {
ast_set2_flag(u_profile, ast_true(value), USER_OPT_DENOISE);
} else if (!strcasecmp(name, "dsp_talking_threshold")) {
@@ -515,6 +517,7 @@ static int parse_user(const char *cat, struct ast_config *cfg)
u_profile->talking_threshold = DEFAULT_TALKING_THRESHOLD;
memset(u_profile->pin, 0, sizeof(u_profile->pin));
memset(u_profile->moh_class, 0, sizeof(u_profile->moh_class));
memset(u_profile->announcement, 0, sizeof(u_profile->announcement));
for (var = ast_variable_browse(cfg, cat); var; var = var->next) {
if (!strcasecmp(var->name, "type")) {
continue;
@@ -859,6 +862,8 @@ static char *handle_cli_confbridge_show_user_profile(struct ast_cli_entry *e, in
ast_cli(a->fd,"MOH Class: %s\n",
ast_strlen_zero(u_profile.moh_class) ?
"default" : u_profile.moh_class);
ast_cli(a->fd,"Announcement: %s\n",
u_profile.announcement);
ast_cli(a->fd,"Quiet: %s\n",
u_profile.flags & USER_OPT_QUIET ?
"enabled" : "disabled");

1
apps/confbridge/include/confbridge.h
View File

@@ -128,6 +128,7 @@ struct user_profile {
char name[128];
char pin[MAX_PIN];
char moh_class[128];
char announcement[PATH_MAX];
unsigned int flags;
unsigned int announce_user_count_all_after;
/*! The time in ms of talking before a user is considered to be talking by the dsp. */