From 62e743e6a7cf41cbaa545f031e7ae1889956eea8 Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Thu, 14 Dec 2017 13:14:10 -0500 Subject: [PATCH] res_musiconhold: Start playlist after initial announcement Reset the samples counter to zero when we are done playing an announcement so that we don't skip into the middle of the first file in the playlist. Also add the selected annoucement to the output of 'moh show classes.' ASTERISK-24329 #close Reported by: Thomas Frederiksen Change-Id: I2a5f986a31279c981592f49391409ebf38d6f6d0 --- res/res_musiconhold.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index dee9c2da8e..57d12789e6 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, "")); ast_cli(a->fd, "\tDirectory: %s\n", S_OR(class->dir, "")); + if (ast_test_flag(class, MOH_ANNOUNCEMENT)) { + ast_cli(a->fd, "\tAnnouncement: %s\n", S_OR(class->announcement, "")); + } if (ast_test_flag(class, MOH_CUSTOM)) { ast_cli(a->fd, "\tApplication: %s\n", S_OR(class->args, "")); ast_cli(a->fd, "\tKill Escalation Delay: %zu ms\n", class->kill_delay / 1000);