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

fix logic bug in conference 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4461 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-03-06 21:19:32 +00:00
parent ca214213b9
commit feb323e04d
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1624,9 +1624,8 @@ static void conference_loop_output(conference_member_t *member)
} }
write_frame.timestamp = timer.samplecount; write_frame.timestamp = timer.samplecount;
switch_core_session_write_frame(member->session, &write_frame, -1, 0); switch_core_session_write_frame(member->session, &write_frame, -1, 0);
if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { switch_core_timer_next(&timer);
break;
}
/* forget the conference data we played file node data instead */ /* forget the conference data we played file node data instead */
switch_mutex_lock(member->audio_out_mutex); switch_mutex_lock(member->audio_out_mutex);
switch_buffer_zero(member->mux_buffer); switch_buffer_zero(member->mux_buffer);
@ -1661,9 +1660,7 @@ static void conference_loop_output(conference_member_t *member)
} }
mux_used = (uint32_t)switch_buffer_inuse(member->mux_buffer) >= bytes ? 1 : 0; mux_used = (uint32_t)switch_buffer_inuse(member->mux_buffer) >= bytes ? 1 : 0;
switch_mutex_unlock(member->audio_out_mutex); switch_mutex_unlock(member->audio_out_mutex);
if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { switch_core_timer_next(&timer);
break;
}
} }
} else { } else {
if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) { if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) {
@ -1673,9 +1670,7 @@ static void conference_loop_output(conference_member_t *member)
write_frame.timestamp = timer.samplecount; write_frame.timestamp = timer.samplecount;
switch_core_session_write_frame(member->session, &write_frame, -1, 0); switch_core_session_write_frame(member->session, &write_frame, -1, 0);
} }
if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) { switch_core_timer_next(&timer);
break;
}
} }
} }
} /* Rinse ... Repeat */ } /* Rinse ... Repeat */