diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-12-15 10:12:30 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-15 10:12:30 -0600 |
| commit | ab8ae8fa9267b022f77f166d8b78395e2aa8a98a (patch) | |
| tree | 6a26a09731f9808d19adc27bbfd4d8688475046e | |
| parent | 7ad305bfef82839af2c8f0ebfa861d36077e7504 (diff) | |
| parent | 62e743e6a7cf41cbaa545f031e7ae1889956eea8 (diff) | |
Merge "res_musiconhold: Start playlist after initial announcement" into 13
| -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 dee9c2da8..57d12789e 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -331,6 +331,7 @@ static int ast_moh_files_next(struct ast_channel *chan) } } else { state->announcement = 0; + state->samples = 0; } if (!state->class->total_files) { @@ -1922,6 +1923,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); |