kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MODAPP-233 (recording members should be invisible to commands 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12582 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-03-12 15:09:31 +00:00
parent 90db12c814
commit aed385fd48
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod/applications/mod_conference/mod_conference.c
View File

@ -2274,7 +2274,7 @@ static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *th
if (switch_test_flag((&fh), SWITCH_FILE_OPEN)) { if (switch_test_flag((&fh), SWITCH_FILE_OPEN)) {
switch_core_file_close(&fh); switch_core_file_close(&fh);
} }
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recording Stopped\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recording of %s Stopped\n", rec->path);
if (rec->pool) { if (rec->pool) {
switch_memory_pool_t *pool = rec->pool; switch_memory_pool_t *pool = rec->pool;
@ -2728,8 +2728,10 @@ static void conference_member_itterator(conference_obj_t *conference, switch_str
switch_mutex_lock(conference->member_mutex); switch_mutex_lock(conference->member_mutex);
for (member = conference->members; member; member = member->next) { for (member = conference->members; member; member = member->next) {
if (member->session && !switch_test_flag(member, MFLAG_NOCHANNEL)) {
pfncallback(member, stream, data); pfncallback(member, stream, data);
} }
}
switch_mutex_unlock(conference->member_mutex); switch_mutex_unlock(conference->member_mutex);
} }
@ -2926,6 +2928,7 @@ static switch_status_t conf_api_sub_kick(conference_member_t *member, switch_str
switch_mutex_lock(member->control_mutex); switch_mutex_lock(member->control_mutex);
switch_clear_flag(member, MFLAG_RUNNING); switch_clear_flag(member, MFLAG_RUNNING);
switch_set_flag_locked(member, MFLAG_KICKED); switch_set_flag_locked(member, MFLAG_KICKED);
switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK);
switch_mutex_unlock(member->control_mutex); switch_mutex_unlock(member->control_mutex);
if (stream != NULL) { if (stream != NULL) {
@ -3907,7 +3910,7 @@ switch_status_t conf_api_dispatch(conference_obj_t *conference, switch_stream_ha
} }
/* exec functio on last (oldest) member */ /* exec functio on last (oldest) member */
if (last_member != NULL) { if (last_member != NULL && last_member->session && !switch_test_flag(last_member, MFLAG_NOCHANNEL)) {
conf_api_member_cmd_t pfn = (conf_api_member_cmd_t) conf_api_sub_commands[i].pfnapicmd; conf_api_member_cmd_t pfn = (conf_api_member_cmd_t) conf_api_sub_commands[i].pfnapicmd;
pfn(last_member, stream, argv[argn + 2]); pfn(last_member, stream, argv[argn + 2]);
} }