<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16256">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  George Joseph: Looks good to me, approved
  Friendly Automation: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">app_queue: Allow streaming multiple announcement files<br><br>Allows multiple files comprising an agent announcement<br>to be played by separating on the ampersand, similar<br>to the multi-file support in other Asterisk applications.<br><br>ASTERISK-29528<br><br>Change-Id: Iec600d8cd5ba14aa1e4e37f906accb356cd7891a<br>---<br>M apps/app_queue.c<br>A doc/CHANGES-staging/app_queue.txt<br>2 files changed, 17 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_queue.c b/apps/app_queue.c</span><br><span>index d3e0471..fdc5211 100644</span><br><span>--- a/apps/app_queue.c</span><br><span>+++ b/apps/app_queue.c</span><br><span>@@ -238,7 +238,13 @@</span><br><span>                    <parameter name="URL"></span><br><span>                               <para><replaceable>URL</replaceable> will be sent to the called party if the channel supports it.</para></span><br><span>                     </parameter></span><br><span style="color: hsl(0, 100%, 40%);">-                      <parameter name="announceoverride" /></span><br><span style="color: hsl(120, 100%, 40%);">+                 <parameter name="announceoverride" argsep="&amp;"></span><br><span style="color: hsl(120, 100%, 40%);">+                              <argument name="filename" required="true"></span><br><span style="color: hsl(120, 100%, 40%);">+                                  <para>Announcement file(s) to play to agent before bridging call, overriding the announcement(s)</span><br><span style="color: hsl(120, 100%, 40%);">+                                        configured in <filename>queues.conf</filename>, if any.</para></span><br><span style="color: hsl(120, 100%, 40%);">+                              </argument></span><br><span style="color: hsl(120, 100%, 40%);">+                             <argument name="filename2" multiple="true" /></span><br><span style="color: hsl(120, 100%, 40%);">+                       </parameter></span><br><span>                   <parameter name="timeout"></span><br><span>                           <para>Will cause the queue to fail out after a specified number of</span><br><span>                             seconds, checked between each <filename>queues.conf</filename> <replaceable>timeout</replaceable> and</span><br><span>@@ -6953,8 +6959,12 @@</span><br><span>                                       res2 = ast_safe_sleep(peer, qe->parent->memberdelay * 1000);</span><br><span>                           }</span><br><span>                            if (!res2 && announce) {</span><br><span style="color: hsl(0, 100%, 40%);">-                                        if (play_file(peer, announce) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                                         ast_log(LOG_ERROR, "play_file failed for '%s' on %s\n", announce, ast_channel_name(peer));</span><br><span style="color: hsl(120, 100%, 40%);">+                                  char *front;</span><br><span style="color: hsl(120, 100%, 40%);">+                                  char *announcefiles = ast_strdupa(announce);</span><br><span style="color: hsl(120, 100%, 40%);">+                                  while ((front = strsep(&announcefiles, "&"))) {</span><br><span style="color: hsl(120, 100%, 40%);">+                                             if (play_file(peer, front) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                                                  ast_log(LOG_ERROR, "play_file failed for '%s' on %s\n", front, ast_channel_name(peer));</span><br><span style="color: hsl(120, 100%, 40%);">+                                             }</span><br><span>                                    }</span><br><span>                            }</span><br><span>                            if (!res2 && qe->parent->reportholdtime) {</span><br><span>diff --git a/doc/CHANGES-staging/app_queue.txt b/doc/CHANGES-staging/app_queue.txt</span><br><span>new file mode 100644</span><br><span>index 0000000..5d677b5</span><br><span>--- /dev/null</span><br><span>+++ b/doc/CHANGES-staging/app_queue.txt</span><br><span>@@ -0,0 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: app_queue.c</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Allow multiple files to be streamed for agent announcement.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16256">change 16256</a>. To unsubscribe, or for help writing mail filters, 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/c/asterisk/+/16256"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 19 </div>
<div style="display:none"> Gerrit-Change-Id: Iec600d8cd5ba14aa1e4e37f906accb356cd7891a </div>
<div style="display:none"> Gerrit-Change-Number: 16256 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: N A <mail@interlinked.x10host.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>