diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-12-15 10:31:21 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-15 10:31:21 -0600 |
commit | bcb4e6e608e12a0a8d34bae3dd6a95bb1d257b9a (patch) | |
tree | a96d6297f6b4cb5df43652e985d7389731f7d8d3 /res | |
parent | b0f054cb2dc9aca99d5b7e023c9b5b62f6506d3f (diff) | |
parent | c387beb456513f10777e3be4136c00f28dfb8b67 (diff) |
Merge "res_musiconhold: Start playlist after initial announcement"
Diffstat (limited to 'res')
-rw-r--r-- | res/res_musiconhold.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index ef1b81c2a..17e91b70c 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -333,6 +333,7 @@ static int ast_moh_files_next(struct ast_channel *chan) } } else { state->announcement = 0; + state->samples = 0; } if (!state->class->total_files) { @@ -1934,6 +1935,9 @@ static char *handle_cli_moh_show_classes(struct ast_cli_entry *e, int cmd, struc ast_cli(a->fd, "Class: %s\n", class->name); ast_cli(a->fd, "\tMode: %s\n", S_OR(class->mode, "<none>")); ast_cli(a->fd, "\tDirectory: %s\n", S_OR(class->dir, "<none>")); + if (ast_test_flag(class, MOH_ANNOUNCEMENT)) { + ast_cli(a->fd, "\tAnnouncement: %s\n", S_OR(class->announcement, "<none>")); + } if (ast_test_flag(class, MOH_CUSTOM)) { ast_cli(a->fd, "\tApplication: %s\n", S_OR(class->args, "<none>")); ast_cli(a->fd, "\tKill Escalation Delay: %zu ms\n", class->kill_delay / 1000); |