<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7582">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_musiconhold: Start playlist after initial announcement<br><br>Reset the samples counter to zero when we are done playing an<br>announcement so that we don't skip into the middle of the first file in<br>the playlist.<br><br>Also add the selected annoucement to the output of 'moh show classes.'<br><br>ASTERISK-24329 #close<br>Reported by: Thomas Frederiksen<br><br>Change-Id: I2a5f986a31279c981592f49391409ebf38d6f6d0<br>---<br>M res/res_musiconhold.c<br>1 file changed, 4 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c<br>index dee9c2d..57d1278 100644<br>--- a/res/res_musiconhold.c<br>+++ b/res/res_musiconhold.c<br>@@ -331,6 +331,7 @@<br>            }<br>     } else {<br>              state->announcement = 0;<br>+          state->samples = 0;<br>        }<br> <br>  if (!state->class->total_files) {<br>@@ -1922,6 +1923,9 @@<br>                ast_cli(a->fd, "Class: %s\n", class->name);<br>           ast_cli(a->fd, "\tMode: %s\n", S_OR(class->mode, "<none>"));<br>          ast_cli(a->fd, "\tDirectory: %s\n", S_OR(class->dir, "<none>"));<br>+             if (ast_test_flag(class, MOH_ANNOUNCEMENT)) {<br>+                        ast_cli(a->fd, "\tAnnouncement: %s\n", S_OR(class->announcement, "<none>"));<br>+         }<br>             if (ast_test_flag(class, MOH_CUSTOM)) {<br>                       ast_cli(a->fd, "\tApplication: %s\n", S_OR(class->args, "<none>"));<br>                   ast_cli(a->fd, "\tKill Escalation Delay: %zu ms\n", class->kill_delay / 1000);<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7582">change 7582</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/7582"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I2a5f986a31279c981592f49391409ebf38d6f6d0 </div>
<div style="display:none"> Gerrit-Change-Number: 7582 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>