kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-04 12:15:04 +00:00
Code Issues Projects Releases Wiki Activity

FS-3518 --resolve this was an issue specific to mute-detect-sound and muting someone right when it decided to play the mute detect sound, fixed with a queued flag so only 1 thread ever plays sounds to the channel

Browse Source
This commit is contained in:
Anthony Minessale 2011-08-25 09:17:50 -05:00
parent 21482f011c
commit da0836c539
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mod/applications/mod_conference/mod_conference.c
View File

@ -145,7 +145,8 @@ typedef enum {
MFLAG_INDICATE_MUTE = (1 << 17), MFLAG_INDICATE_MUTE = (1 << 17),
MFLAG_INDICATE_UNMUTE = (1 << 18), MFLAG_INDICATE_UNMUTE = (1 << 18),
MFLAG_NOMOH = (1 << 19), MFLAG_NOMOH = (1 << 19),
MFLAG_VIDEO_BRIDGE = (1 << 20) MFLAG_VIDEO_BRIDGE = (1 << 20),
MFLAG_INDICATE_MUTE_DETECT = (1 << 21)
} member_flag_t; } member_flag_t;
typedef enum { typedef enum {
@ -2359,7 +2360,7 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
if (switch_test_flag(member, MFLAG_MUTE_DETECT) && !switch_test_flag(member, MFLAG_CAN_SPEAK)) { if (switch_test_flag(member, MFLAG_MUTE_DETECT) && !switch_test_flag(member, MFLAG_CAN_SPEAK)) {
if (!zstr(member->conference->mute_detect_sound)) { if (!zstr(member->conference->mute_detect_sound)) {
conference_member_play_file(member, member->conference->mute_detect_sound, 0); switch_set_flag(member, MFLAG_INDICATE_MUTE_DETECT);
} }
if (test_eflag(member->conference, EFLAG_MUTE_DETECT) && if (test_eflag(member->conference, EFLAG_MUTE_DETECT) &&
@ -2851,6 +2852,18 @@ static void conference_loop_output(conference_member_t *member)
switch_clear_flag(member, MFLAG_INDICATE_MUTE); switch_clear_flag(member, MFLAG_INDICATE_MUTE);
} }
if (switch_test_flag(member, MFLAG_INDICATE_MUTE_DETECT)) {
if (!zstr(member->conference->mute_detect_sound)) {
conference_member_play_file(member, member->conference->mute_detect_sound, 0);
} else {
char msg[512];
switch_snprintf(msg, sizeof(msg), "Currently Muted");
conference_member_say(member, msg, 0);
}
switch_clear_flag(member, MFLAG_INDICATE_MUTE_DETECT);
}
if (switch_test_flag(member, MFLAG_INDICATE_UNMUTE)) { if (switch_test_flag(member, MFLAG_INDICATE_UNMUTE)) {
if (!zstr(member->conference->unmuted_sound)) { if (!zstr(member->conference->unmuted_sound)) {
conference_member_play_file(member, member->conference->unmuted_sound, 0); conference_member_play_file(member, member->conference->unmuted_sound, 0);