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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">confbridge: announce to the marked users when they join an empty conference<br><br>Currently the file sound_only_person is not played when a marked<br>user (with announce_only_user=yes) joins an empty conference.<br><br>This patch fixes it.<br><br>ASTERISK-28201 #close<br><br>Change-Id: I85b67687e6b220939c3af8091d83a70a7b174cf4<br>---<br>M apps/app_confbridge.c<br>M apps/confbridge/conf_state_empty.c<br>M apps/confbridge/conf_state_inactive.c<br>M apps/confbridge/include/confbridge.h<br>4 files changed, 7 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c</span><br><span>index ad871e0..33cfbb3 100644</span><br><span>--- a/apps/app_confbridge.c</span><br><span>+++ b/apps/app_confbridge.c</span><br><span>@@ -1360,7 +1360,7 @@</span><br><span>     return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int conf_handle_only_unmarked(struct confbridge_user *user)</span><br><span style="color: hsl(120, 100%, 40%);">+int conf_handle_only_person(struct confbridge_user *user)</span><br><span> {</span><br><span>        /* If audio prompts have not been quieted or this prompt quieted play it on out */</span><br><span>   if (!ast_test_flag(&user->u_profile, USER_OPT_QUIET | USER_OPT_NOONLYPERSON)) {</span><br><span>diff --git a/apps/confbridge/conf_state_empty.c b/apps/confbridge/conf_state_empty.c</span><br><span>index 285f22a..d2f4c8d 100644</span><br><span>--- a/apps/confbridge/conf_state_empty.c</span><br><span>+++ b/apps/confbridge/conf_state_empty.c</span><br><span>@@ -56,7 +56,7 @@</span><br><span> {</span><br><span>         conf_add_user_active(user->conference, user);</span><br><span>     conf_handle_first_join(user->conference);</span><br><span style="color: hsl(0, 100%, 40%);">-    conf_add_post_join_action(user, conf_handle_only_unmarked);</span><br><span style="color: hsl(120, 100%, 40%);">+   conf_add_post_join_action(user, conf_handle_only_person);</span><br><span> </span><br><span>        conf_change_state(user, CONF_STATE_SINGLE);</span><br><span> }</span><br><span>@@ -73,6 +73,7 @@</span><br><span> {</span><br><span>    conf_add_user_marked(user->conference, user);</span><br><span>     conf_handle_first_join(user->conference);</span><br><span style="color: hsl(120, 100%, 40%);">+  conf_add_post_join_action(user, conf_handle_only_person);</span><br><span> </span><br><span>        conf_change_state(user, CONF_STATE_SINGLE_MARKED);</span><br><span> }</span><br><span>diff --git a/apps/confbridge/conf_state_inactive.c b/apps/confbridge/conf_state_inactive.c</span><br><span>index bc41e61..b1a4a2e 100644</span><br><span>--- a/apps/confbridge/conf_state_inactive.c</span><br><span>+++ b/apps/confbridge/conf_state_inactive.c</span><br><span>@@ -51,7 +51,7 @@</span><br><span> static void join_unmarked(struct confbridge_user *user)</span><br><span> {</span><br><span>         conf_add_user_active(user->conference, user);</span><br><span style="color: hsl(0, 100%, 40%);">-        conf_add_post_join_action(user, conf_handle_only_unmarked);</span><br><span style="color: hsl(120, 100%, 40%);">+   conf_add_post_join_action(user, conf_handle_only_person);</span><br><span> </span><br><span>        conf_change_state(user, CONF_STATE_SINGLE);</span><br><span> }</span><br><span>diff --git a/apps/confbridge/include/confbridge.h b/apps/confbridge/include/confbridge.h</span><br><span>index ac403d8..4b8249f 100644</span><br><span>--- a/apps/confbridge/include/confbridge.h</span><br><span>+++ b/apps/confbridge/include/confbridge.h</span><br><span>@@ -490,13 +490,11 @@</span><br><span>  */</span><br><span> int conf_handle_inactive_waitmarked(struct confbridge_user *user);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! \brief Handle actions whenever an unmarked user joins an inactive conference</span><br><span style="color: hsl(0, 100%, 40%);">- * \note These actions seem like they could apply just as well to a marked user</span><br><span style="color: hsl(0, 100%, 40%);">- * and possibly be made to happen any time transitioning to a single state.</span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief Handle actions whenever an user joins an empty conference</span><br><span>  *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param user The unmarked user</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param user The user</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-int conf_handle_only_unmarked(struct confbridge_user *user);</span><br><span style="color: hsl(120, 100%, 40%);">+int conf_handle_only_person(struct confbridge_user *user);</span><br><span> </span><br><span> /*! \brief Handle when a conference moves to having more than one active participant</span><br><span>  * \param conference The conference bridge with more than one active participant</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10811">change 10811</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/10811"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I85b67687e6b220939c3af8091d83a70a7b174cf4 </div>
<div style="display:none"> Gerrit-Change-Number: 10811 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexei Gradinari <alex2grad@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation (1000185) </div>
<div style="display:none"> Gerrit-Reviewer: Joshua C. Colp <jcolp@digium.com> </div>