<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/13202">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
  Friendly Automation: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bridge_softmix: clear hold when joining a softmix bridge<br><br>MOH continues to play to a channel if that channel was on hold prior to<br>entering a softmix bridge. MOH will not stop even if the original "holder"<br>attempts an unhold.<br><br>For the most part a softmix bridge ignores holds, so a participating channel<br>shouldn't join while on hold. This patch checks to see if the channel joining<br>the softmix bridge is currently on hold. If so then it indicates an unhold.<br><br>ASTERISK-28618<br><br>Change-Id: I66ccd4efc80f5b4c3dd68186b379eb442916392b<br>---<br>M bridges/bridge_softmix.c<br>1 file changed, 7 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c</span><br><span>index fbe1587..0febc46 100644</span><br><span>--- a/bridges/bridge_softmix.c</span><br><span>+++ b/bridges/bridge_softmix.c</span><br><span>@@ -479,6 +479,13 @@</span><br><span>                      : DEFAULT_SOFTMIX_INTERVAL,</span><br><span>          bridge_channel, 0);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+       /* Complete any active hold before entering, or transitioning to softmix. */</span><br><span style="color: hsl(120, 100%, 40%);">+  if (ast_channel_hold_state(bridge_channel->chan) == AST_CONTROL_HOLD) {</span><br><span style="color: hsl(120, 100%, 40%);">+            ast_debug(1, "Channel %s simulating UNHOLD for bridge softmix join.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                     ast_channel_name(bridge_channel->chan));</span><br><span style="color: hsl(120, 100%, 40%);">+           ast_indicate(bridge_channel->chan, AST_CONTROL_UNHOLD);</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  softmix_poke_thread(softmix_data);</span><br><span>   return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/13202">change 13202</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/+/13202"/><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-Change-Id: I66ccd4efc80f5b4c3dd68186b379eb442916392b </div>
<div style="display:none"> Gerrit-Change-Number: 13202 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Kevin Harwell <kharwell@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-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>