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/confbridge/conf_config_parser.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/confbridge/conf_config_parser.c')
| -rw-r--r-- | apps/confbridge/conf_config_parser.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c index a73c65820..0ae9ada94 100644 --- a/apps/confbridge/conf_config_parser.c +++ b/apps/confbridge/conf_config_parser.c @@ -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"); |