<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/14991">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Benjamin Keith Ford: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_musiconhold: Clarify that playlist mode only supports HTTP(S) URLs<br><br>Change-Id: I41e77a04e4a523f4ed61a7a20b738ffd42be441e<br>---<br>M configs/samples/musiconhold.conf.sample<br>M res/res_musiconhold.c<br>2 files changed, 3 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configs/samples/musiconhold.conf.sample b/configs/samples/musiconhold.conf.sample</span><br><span>index 1090bbe..2f60108 100644</span><br><span>--- a/configs/samples/musiconhold.conf.sample</span><br><span>+++ b/configs/samples/musiconhold.conf.sample</span><br><span>@@ -13,7 +13,7 @@</span><br><span> ; valid mode options:</span><br><span> ; files -- read files from a directory in any Asterisk supported</span><br><span> ; media format</span><br><span style="color: hsl(0, 100%, 40%);">-; playlist -- provide a fixed list of filenames or URLs to play</span><br><span style="color: hsl(120, 100%, 40%);">+; playlist -- provide a fixed list of filenames or HTTP(S) URLs to play</span><br><span> ; quietmp3 -- default</span><br><span> ; mp3 -- loud</span><br><span> ; mp3nb -- unbuffered</span><br><span>@@ -56,7 +56,7 @@</span><br><span> ; Each entry must be one of:</span><br><span> ;</span><br><span> ; * An absolute path to the file to be played, without an extension.</span><br><span style="color: hsl(0, 100%, 40%);">-; * A URL</span><br><span style="color: hsl(120, 100%, 40%);">+; * An HTTP(S) URL</span><br><span> ;</span><br><span> ; The entries are played in the order in which they appear in the</span><br><span> ; configuration. The 'sort' option is not used for this mode.</span><br><span>diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c</span><br><span>index 46bc4b9..8d1ab2a 100644</span><br><span>--- a/res/res_musiconhold.c</span><br><span>+++ b/res/res_musiconhold.c</span><br><span>@@ -1144,7 +1144,7 @@</span><br><span> </span><br><span> AST_VECTOR_APPEND(playlist_entries, dup);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(LOG_ERROR, "Playlist entries must be a URL or absolute path, '%s' provided.\n", var->value);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_ERROR, "Playlist entries must be an HTTP(S) URL or absolute path, '%s' provided.\n", var->value);</span><br><span> }</span><br><span> } else if (!strcasecmp(var->name, "directory")) {</span><br><span> ast_copy_string(mohclass->dir, var->value, sizeof(mohclass->dir));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/14991">change 14991</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/+/14991"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 17 </div>
<div style="display:none"> Gerrit-Change-Id: I41e77a04e4a523f4ed61a7a20b738ffd42be441e </div>
<div style="display:none"> Gerrit-Change-Number: 14991 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.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>