kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mod_conference: fix relate nohear (MODAPP-428)

This commit is contained in:
Michael Jerris 2010-05-31 08:40:51 -04:00
parent a6e6514799
commit f029ce07b7
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1244,15 +1244,23 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
*/ */
if (conference->relationship_total) { if (conference->relationship_total) {
for (imember = conference->members; imember; imember = imember->next) { for (imember = conference->members; imember; imember = imember->next) {
conference_relationship_t *rel;
for (rel = imember->relationships; rel; rel = rel->next) {
if (imember != omember && switch_test_flag(imember, MFLAG_HAS_AUDIO)) { if (imember != omember && switch_test_flag(imember, MFLAG_HAS_AUDIO)) {
conference_relationship_t *rel;
switch_size_t found = 0;
int16_t *rptr = (int16_t *) imember->frame; int16_t *rptr = (int16_t *) imember->frame;
for (rel = imember->relationships; rel; rel = rel->next) {
if ((rel->id == omember->id || rel->id == 0) && !switch_test_flag(rel, RFLAG_CAN_SPEAK)) { if ((rel->id == omember->id || rel->id == 0) && !switch_test_flag(rel, RFLAG_CAN_SPEAK)) {
z -= (int32_t) rptr[x]; z -= (int32_t) rptr[x];
found = 1;
break;
} }
}
if (!found) {
for (rel = omember->relationships; rel; rel = rel->next) {
if ((rel->id == imember->id || rel->id == 0) && !switch_test_flag(rel, RFLAG_CAN_HEAR)) { if ((rel->id == imember->id || rel->id == 0) && !switch_test_flag(rel, RFLAG_CAN_HEAR)) {
z -= (int32_t) rptr[x]; z -= (int32_t) rptr[x];
break;
}
} }
} }