From 53382fe8dac230c1ec169cfe7c039c2a4452f3c8 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 14 Aug 2007 19:36:56 +0000 Subject: [PATCH] revert unintended commit git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5602 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/applications/mod_conference/mod_conference.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 087173e131..de1204eb91 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -1703,6 +1703,7 @@ static void conference_loop_output(conference_member_t * member) write_frame.timestamp = timer.samplecount; switch_core_session_write_frame(member->session, &write_frame, -1, 0); switch_core_timer_next(&timer); + /* forget the conference data we played file node data instead */ 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); if (use_timer) { - //switch_core_timer_next(&timer); + switch_core_timer_next(&timer); } } /* Rinse ... Repeat */