[Freeswitch-svn] [commit] r4461 - freeswitch/trunk/src/mod/applications/mod_conference

[Freeswitch SVN]

Author: anthm
Date: Tue Mar  6 16:19:32 2007
New Revision: 4461

Modified:
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c

Log:
fix logic bug in conference

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	Tue Mar  6 16:19:32 2007
@@ -1624,9 +1624,8 @@
 						}
 						write_frame.timestamp = timer.samplecount;
 						switch_core_session_write_frame(member->session, &write_frame, -1, 0);
-						if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) {
-							break;
-						}
+						switch_core_timer_next(&timer);
+
 						/* forget the conference data we played file node data instead */
 						switch_mutex_lock(member->audio_out_mutex);
 						switch_buffer_zero(member->mux_buffer);
@@ -1661,9 +1660,7 @@
 					}
 					mux_used = (uint32_t)switch_buffer_inuse(member->mux_buffer) >= bytes ? 1 : 0;
 					switch_mutex_unlock(member->audio_out_mutex);
-					if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) {
-						break;
-					}
+					switch_core_timer_next(&timer);
 				}
 			} else {
 				if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) {
@@ -1673,9 +1670,7 @@
 					write_frame.timestamp = timer.samplecount;
 					switch_core_session_write_frame(member->session, &write_frame, -1, 0);
 				}
-				if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) {
-					break;
-				}
+				switch_core_timer_next(&timer);
 			}
 		}
 	} /* Rinse ... Repeat */