[Asterisk-code-review] confbridge: announce to the marked users when they join an e... (asterisk[master])

[Joshua C. Colp]

Joshua C. Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/10810 )

Change subject: confbridge: announce to the marked users when they join an empty conference
......................................................................

confbridge: announce to the marked users when they join an empty conference

Currently the file sound_only_person is not played when a marked
user (with announce_only_user=yes) joins an empty conference.

This patch fixes it.

ASTERISK-28201 #close

Change-Id: I85b67687e6b220939c3af8091d83a70a7b174cf4
---
M apps/app_confbridge.c
M apps/confbridge/conf_state_empty.c
M apps/confbridge/conf_state_inactive.c
M apps/confbridge/include/confbridge.h
4 files changed, 7 insertions(+), 8 deletions(-)

Approvals:
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  Joshua C. Colp: Looks good to me, approved; Approved for Submit



diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index ad871e0..33cfbb3 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -1360,7 +1360,7 @@
 	return 0;
 }
 
-int conf_handle_only_unmarked(struct confbridge_user *user)
+int conf_handle_only_person(struct confbridge_user *user)
 {
 	/* If audio prompts have not been quieted or this prompt quieted play it on out */
 	if (!ast_test_flag(&user->u_profile, USER_OPT_QUIET | USER_OPT_NOONLYPERSON)) {
diff --git a/apps/confbridge/conf_state_empty.c b/apps/confbridge/conf_state_empty.c
index 285f22a..d2f4c8d 100644
--- a/apps/confbridge/conf_state_empty.c
+++ b/apps/confbridge/conf_state_empty.c
@@ -56,7 +56,7 @@
 {
 	conf_add_user_active(user->conference, user);
 	conf_handle_first_join(user->conference);
-	conf_add_post_join_action(user, conf_handle_only_unmarked);
+	conf_add_post_join_action(user, conf_handle_only_person);
 
 	conf_change_state(user, CONF_STATE_SINGLE);
 }
@@ -73,6 +73,7 @@
 {
 	conf_add_user_marked(user->conference, user);
 	conf_handle_first_join(user->conference);
+	conf_add_post_join_action(user, conf_handle_only_person);
 
 	conf_change_state(user, CONF_STATE_SINGLE_MARKED);
 }
diff --git a/apps/confbridge/conf_state_inactive.c b/apps/confbridge/conf_state_inactive.c
index bc41e61..b1a4a2e 100644
--- a/apps/confbridge/conf_state_inactive.c
+++ b/apps/confbridge/conf_state_inactive.c
@@ -51,7 +51,7 @@
 static void join_unmarked(struct confbridge_user *user)
 {
 	conf_add_user_active(user->conference, user);
-	conf_add_post_join_action(user, conf_handle_only_unmarked);
+	conf_add_post_join_action(user, conf_handle_only_person);
 
 	conf_change_state(user, CONF_STATE_SINGLE);
 }
diff --git a/apps/confbridge/include/confbridge.h b/apps/confbridge/include/confbridge.h
index ac403d8..4b8249f 100644
--- a/apps/confbridge/include/confbridge.h
+++ b/apps/confbridge/include/confbridge.h
@@ -490,13 +490,11 @@
  */
 int conf_handle_inactive_waitmarked(struct confbridge_user *user);
 
-/*! \brief Handle actions whenever an unmarked user joins an inactive conference
- * \note These actions seem like they could apply just as well to a marked user
- * and possibly be made to happen any time transitioning to a single state.
+/*! \brief Handle actions whenever an user joins an empty conference
  *
- * \param user The unmarked user
+ * \param user The user
  */
-int conf_handle_only_unmarked(struct confbridge_user *user);
+int conf_handle_only_person(struct confbridge_user *user);
 
 /*! \brief Handle when a conference moves to having more than one active participant
  * \param conference The conference bridge with more than one active participant

-- 
To view, visit https://gerrit.asterisk.org/10810
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I85b67687e6b220939c3af8091d83a70a7b174cf4
Gerrit-Change-Number: 10810
Gerrit-PatchSet: 1
Gerrit-Owner: Alexei Gradinari <alex2grad at gmail.com>
Gerrit-Reviewer: Benjamin Keith Ford <bford at digium.com>
Gerrit-Reviewer: Friendly Automation (1000185)
Gerrit-Reviewer: Joshua C. Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20181213/89e3f153/attachment.html>