mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-07-25 03:10:39 +00:00
revert unintended commit
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5602 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
09e96025e9
commit
53382fe8da
@ -1703,6 +1703,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);
|
||||||
switch_core_timer_next(&timer);
|
switch_core_timer_next(&timer);
|
||||||
|
|
||||||
/* forget the conference data we played file node data instead */
|
/* forget the conference data we played file node data instead */
|
||||||
switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER);
|
switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER);
|
||||||
}
|
}
|
||||||
@ -1774,7 +1775,7 @@ static void conference_loop_output(conference_member_t * member)
|
|||||||
switch_mutex_unlock(member->flag_mutex);
|
switch_mutex_unlock(member->flag_mutex);
|
||||||
|
|
||||||
if (use_timer) {
|
if (use_timer) {
|
||||||
//switch_core_timer_next(&timer);
|
switch_core_timer_next(&timer);
|
||||||
}
|
}
|
||||||
|
|
||||||
} /* Rinse ... Repeat */
|
} /* Rinse ... Repeat */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user