]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
revert unintended commit
authorAnthony Minessale <anthony.minessale@gmail.com>
Tue, 14 Aug 2007 19:36:56 +0000 (19:36 +0000)
committerAnthony Minessale <anthony.minessale@gmail.com>
Tue, 14 Aug 2007 19:36:56 +0000 (19:36 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5602 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/applications/mod_conference/mod_conference.c

index 087173e1310cfb40e81d620614589d3782e236e4..de1204eb919d6b206092f840d6d1d784957ce351 100644 (file)
@@ -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 */