[svn-commits] file: trunk r181210 - /trunk/apps/app_confbridge.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed Mar 11 08:44:42 2009
New Revision: 181210

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=181210
Log:
Don't play the "you are about to be placed into the conference" and "the leader has left the conference" sounds if the quiet
option is enabled. (reported by Vadim Lebedev on the asterisk-dev list)

Modified:
    trunk/apps/app_confbridge.c

Modified: trunk/apps/app_confbridge.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/apps/app_confbridge.c?view=diff&rev=181210&r1=181209&r2=181210
==============================================================================
--- trunk/apps/app_confbridge.c (original)
+++ trunk/apps/app_confbridge.c Wed Mar 11 08:44:42 2009
@@ -271,11 +271,13 @@
 		}
 
 		/* Next play the audio file stating they are going to be placed into the conference */
-		ao2_unlock(conference_bridge);
-		ast_autoservice_start(conference_bridge_user->chan);
-		play_sound_file(conference_bridge, "conf-placeintoconf");
-		ast_autoservice_stop(conference_bridge_user->chan);
-		ao2_lock(conference_bridge);
+		if (!ast_test_flag(&conference_bridge_user->flags, OPTION_QUIET)) {
+			ao2_unlock(conference_bridge);
+			ast_autoservice_start(conference_bridge_user->chan);
+			play_sound_file(conference_bridge, "conf-placeintoconf");
+			ast_autoservice_stop(conference_bridge_user->chan);
+			ao2_lock(conference_bridge);
+		}
 
 		/* Finally iterate through and unmute them all */
 		AST_LIST_TRAVERSE(&conference_bridge->users_list, other_conference_bridge_user, list) {
@@ -505,11 +507,13 @@
 			}
 
 			/* Play back the audio prompt saying the leader has left the conference */
-			ao2_unlock(conference_bridge);
-			ast_autoservice_start(conference_bridge_user->chan);
-			play_sound_file(conference_bridge, "conf-leaderhasleft");
-			ast_autoservice_stop(conference_bridge_user->chan);
-			ao2_lock(conference_bridge);
+			if (!ast_test_flag(&conference_bridge_user->flags, OPTION_QUIET)) {
+				ao2_unlock(conference_bridge);
+				ast_autoservice_start(conference_bridge_user->chan);
+				play_sound_file(conference_bridge, "conf-leaderhasleft");
+				ast_autoservice_stop(conference_bridge_user->chan);
+				ao2_lock(conference_bridge);
+			}
 
 			/* Now on to starting MOH if needed */
 			AST_LIST_TRAVERSE(&conference_bridge->users_list, other_participant, list) {