]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
add on to last commit
authorAnthony Minessale <anthm@freeswitch.org>
Fri, 7 Mar 2014 01:34:32 +0000 (06:34 +0500)
committerAnthony Minessale <anthm@freeswitch.org>
Fri, 7 Mar 2014 01:34:32 +0000 (06:34 +0500)
src/mod/applications/mod_conference/mod_conference.c

index 4e67b99041d7866c7ce8d23e819610409544b0d1..40e8c63d9a90b499b0e8b6b6cdb68eb019faa85f 100644 (file)
@@ -3923,9 +3923,12 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
                        member->last_score = member->score;
                }
 
+               loops++;
+
                if (switch_channel_test_flag(member->channel, CF_CONFERENCE_RESET_MEDIA)) {
                        switch_channel_clear_flag(member->channel, CF_CONFERENCE_RESET_MEDIA);
-                       if (++loops > 500) {
+
+                       if (loops > 500) {
                                member->loop_loop = 1;
 
                                if (setup_media(member, member->conference)) {
@@ -7056,8 +7059,6 @@ static switch_status_t conf_api_sub_file_vol(conference_obj_t *conference, switc
                        }
                }
 
-               printf("WTF %p %p\n", (void *) conference, (void *) fnode);
-
                if (fnode && fnode->type == NODE_TYPE_FILE) {
                        fnode->fh.vol = vol;
                        ok = 1;