[asterisk-commits] dvossel: branch dvossel/hd_confbridge r310634 - in /team/dvossel/hd_confbridg...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon Mar 14 11:46:41 2011
New Revision: 310634

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=310634
Log:
Documentation update

Modified:
    team/dvossel/hd_confbridge/apps/app_confbridge.c
    team/dvossel/hd_confbridge/configs/confbridge.conf.sample

Modified: team/dvossel/hd_confbridge/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/hd_confbridge/apps/app_confbridge.c?view=diff&rev=310634&r1=310633&r2=310634
==============================================================================
--- team/dvossel/hd_confbridge/apps/app_confbridge.c (original)
+++ team/dvossel/hd_confbridge/apps/app_confbridge.c Mon Mar 14 11:46:41 2011
@@ -622,6 +622,8 @@
 		.chan = chan,
 	};
 	const char *tmp, *join_sound = NULL, *leave_sound = NULL;
+	int quiet = 0;
+
 	AST_DECLARE_APP_ARGS(args,
 		AST_APP_ARG(conf_name);
 		AST_APP_ARG(b_profile_name);
@@ -650,8 +652,10 @@
 		u_profile_name = args.u_profile_name;
 	}
 	conf_find_user_profile(u_profile_name, &conference_bridge_user.u_profile);
-
-	/* ask for a PIN immediately after finding user profile */
+	quiet = ast_test_flag(&conference_bridge_user.u_profile, USER_OPT_QUIET);
+
+	/* ask for a PIN immediately after finding user profile.  This has to be
+	 * prompted for requardless of quiet setting. */
 	if (!ast_strlen_zero(conference_bridge_user.u_profile.pin)) {
 		if (conf_get_pin(chan, conference_bridge_user.u_profile.pin)) {
 			return -1; /* invalid PIN */
@@ -659,7 +663,7 @@
 	}
 
 	/* See if we need them to record a intro name */
-	if (ast_test_flag(&conference_bridge_user.u_profile, USER_OPT_ANNOUNCE_JOIN_LEAVE)) {
+	if (!quiet && ast_test_flag(&conference_bridge_user.u_profile, USER_OPT_ANNOUNCE_JOIN_LEAVE)) {
 		conf_rec_name(&conference_bridge_user, args.conf_name);
 	}
 
@@ -719,7 +723,7 @@
 	}
 
 	/* If there is 1 or more people already in the conference then play our join sound unless overridden */
-	if (!ast_test_flag(&conference_bridge_user.u_profile, USER_OPT_QUIET) && !ast_strlen_zero(join_sound) && conference_bridge->users >= 2) {
+	if (!quiet && !ast_strlen_zero(join_sound) && conference_bridge->users >= 2) {
 		ast_autoservice_start(chan);
 		play_sound_file(conference_bridge, join_sound);
 		ast_autoservice_stop(chan);
@@ -729,7 +733,7 @@
 	ast_bridge_join(conference_bridge->bridge, chan, NULL, &conference_bridge_user.features);
 
 	/* if this user has a intro, play it when leaving */
-	if (!ast_strlen_zero(conference_bridge_user.name_rec_location)) {
+	if (!quiet && !ast_strlen_zero(conference_bridge_user.name_rec_location)) {
 		ast_autoservice_start(chan);
 		play_sound_file(conference_bridge, conference_bridge_user.name_rec_location);
 		play_sound_file(conference_bridge, "conf-hasleft");
@@ -737,7 +741,7 @@
 	}
 
 	/* If there is 1 or more people (not including us) already in the conference then play our leave sound unless overridden */
-	if (!ast_test_flag(&conference_bridge_user.u_profile, USER_OPT_QUIET) && !ast_strlen_zero(leave_sound) && conference_bridge->users >= 2) {
+	if (!quiet && !ast_strlen_zero(leave_sound) && conference_bridge->users >= 2) {
 		ast_autoservice_start(chan);
 		play_sound_file(conference_bridge, leave_sound);
 		ast_autoservice_stop(chan);
@@ -751,7 +755,7 @@
 	ast_bridge_features_cleanup(&conference_bridge_user.features);
 
 	/* If the user was kicked from the conference play back the audio prompt for it */
-	if (!ast_test_flag(&conference_bridge_user.u_profile, USER_OPT_QUIET) && conference_bridge_user.kicked) {
+	if (!quiet && conference_bridge_user.kicked) {
 		res = ast_stream_and_wait(chan, "conf-kicked", "");
 	}
 

Modified: team/dvossel/hd_confbridge/configs/confbridge.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/hd_confbridge/configs/confbridge.conf.sample?view=diff&rev=310634&r1=310633&r2=310634
==============================================================================
--- team/dvossel/hd_confbridge/configs/confbridge.conf.sample (original)
+++ team/dvossel/hd_confbridge/configs/confbridge.conf.sample Mon Mar 14 11:46:41 2011
@@ -18,7 +18,9 @@
 ;startmuted=yes; Sets if all users should start out muted. Off by default
 ;music_on_hold_when_empty=yes  ; Sets whether MOH should be played when only
                                ; one person is in the conference.  Off by default.
-;quiet=yes            ; Sets if no audio prompts should be played. Off by default
+;quiet=yes     ; Sets if no audio prompts should be played.  There are some prompts,
+               ; such as the prompt to enter a PIN number, that must be played regardless
+               ; of what this option is set to.  Off by default
 ;announce_user_count=yes  ; Sets if the number of users should be announced to the
                           ; caller.  Off by default.
 ;announce_only_user=yes   ; Sets if the only user announcement should be played