Author: anthm Date: Wed Aug 29 20:25:06 2007 New Revision: 5679 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: cleanup 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 Wed Aug 29 20:25:06 2007 @@ -610,10 +610,7 @@ cur = fnode; fnode = fnode->next; - if (cur->type == NODE_TYPE_SPEECH) { - //switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - //switch_core_speech_close(&cur->sh, &flags); - } else { + if (cur->type != NODE_TYPE_SPEECH) { switch_core_file_close(&cur->fh); } @@ -624,7 +621,7 @@ if (member->sh) { switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - switch_core_speech_close(member->sh, &flags); + switch_core_speech_close(&member->lsh, &flags); member->sh = NULL; } @@ -906,10 +903,7 @@ conference_file_node_t *fnode; switch_memory_pool_t *pool; - if (conference->fnode->type == NODE_TYPE_SPEECH) { - //switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - //switch_core_speech_close(conference->fnode->sh, &flags); - } else { + if (conference->fnode->type != NODE_TYPE_SPEECH) { switch_core_file_close(&conference->fnode->fh); } @@ -952,10 +946,7 @@ cur = fnode; fnode = fnode->next; - if (cur->type == NODE_TYPE_SPEECH) { - //switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - //switch_core_speech_close(&cur->sh, &flags); - } else { + if (cur->type != NODE_TYPE_SPEECH) { switch_core_file_close(&cur->fh); } @@ -1003,7 +994,7 @@ if (conference->sh) { switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - switch_core_speech_close(conference->sh, &flags); + switch_core_speech_close(&conference->lsh, &flags); conference->sh = NULL; } @@ -1673,10 +1664,7 @@ conference_file_node_t *fnode; switch_memory_pool_t *pool; - if (member->fnode->type == NODE_TYPE_SPEECH) { - //switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - //switch_core_speech_close(&member->fnode->sh, &flags); - } else { + if (member->fnode->type != NODE_TYPE_SPEECH) { switch_core_file_close(&member->fnode->fh); }