From: Anthony Minessale Date: Fri, 7 Mar 2014 01:34:32 +0000 (+0500) Subject: add on to last commit X-Git-Tag: v1.5.11~115 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5375d8b643d45beeba13587db70e0853cc5cc4d7;p=thirdparty%2Ffreeswitch.git add on to last commit --- diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 4e67b99041..40e8c63d9a 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -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;