diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-11 13:44:42 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-11 13:44:42 +0000 |
| commit | 7a8c2fedcf25d8b9c95aa0723ff89968d537c238 (patch) | |
| tree | 7ded847fb171d1310a10c9ffaf2dbb4053ccc9ba | |
| parent | 7e7a32a4ed051bbad971705dee155864254a85ad (diff) | |
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)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@181210 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_confbridge.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index 058f581ec..3531b684b 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -271,11 +271,13 @@ static void post_join_marked(struct conference_bridge *conference_bridge, struct } /* 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 @@ static void leave_conference_bridge(struct conference_bridge *conference_bridge } /* 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) { |