kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 15:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_musiconhold: Start playlist after initial announcement"

Browse Source
This commit is contained in:
Jenkins2
2017-12-15 10:31:21 -06:00
committed by Gerrit Code Review
parent b0f054cb2d c387beb456
commit bcb4e6e608
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_musiconhold.c
View File

@@ -333,6 +333,7 @@ static int ast_moh_files_next(struct ast_channel *chan)
} }
} else { } else {
state->announcement = 0; state->announcement = 0;
state->samples = 0;
} }
if (!state->class->total_files) { 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, "Class: %s\n", class->name);
ast_cli(a->fd, "\tMode: %s\n", S_OR(class->mode, "<none>")); ast_cli(a->fd, "\tMode: %s\n", S_OR(class->mode, "<none>"));
ast_cli(a->fd, "\tDirectory: %s\n", S_OR(class->dir, "<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)) { if (ast_test_flag(class, MOH_CUSTOM)) {
ast_cli(a->fd, "\tApplication: %s\n", S_OR(class->args, "<none>")); 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); ast_cli(a->fd, "\tKill Escalation Delay: %zu ms\n", class->kill_delay / 1000);