From a223a59d5e7915133d2fc6d8a1bef84eb3569f8a Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 6 Feb 2009 16:03:56 +0000 Subject: [PATCH] fix regression in previous fix for MODAPP-209 git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11663 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/esl/testclient.c | 16 +++++++++++++++- scripts/freeswitch-gcore | 2 +- .../applications/mod_conference/mod_conference.c | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libs/esl/testclient.c b/libs/esl/testclient.c index c9509049eb..2c8b9a04de 100644 --- a/libs/esl/testclient.c +++ b/libs/esl/testclient.c @@ -9,7 +9,21 @@ int main(void) esl_connect(&handle, "localhost", 8021, "ClueCon"); - esl_send_recv(&handle, "api status\n\n"); + esl_send_recv(&handle, "api conference 3100 play /root/sr8k.raw 1\n\n"); + + esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3101\n\n"); + + esl_send_recv(&handle, "api conference 3101 play /root/sr8k.raw 2\n\n"); + + esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3102\n\n"); + + esl_send_recv(&handle, "api conference 3102 play /root/sr8k.raw 3\n\n"); + + esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3103\n\n"); + + esl_send_recv(&handle, "api conference 3103 play /root/sr8k.raw 4\n\n"); + + esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3104\n\n"); esl_disconnect(&handle); diff --git a/scripts/freeswitch-gcore b/scripts/freeswitch-gcore index 7ddbdffc9d..d1ca0feaca 100644 --- a/scripts/freeswitch-gcore +++ b/scripts/freeswitch-gcore @@ -9,4 +9,4 @@ gcore -o /usr/local/freeswitch/log/freeswitch.gcore $fspid && \ --eval-command='thread apply all bt' \ --eval-command='thread apply all bt full' \ --eval-command='quit' -rm /usr/local/freeswitch/log/freeswitch.gcore.$fspid +#rm /usr/local/freeswitch/log/freeswitch.gcore.$fspid diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index bf72f82caa..71a574af59 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -2181,6 +2181,7 @@ static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *th switch_mutex_init(&member->control_mutex, SWITCH_MUTEX_NESTED, rec->pool); + switch_mutex_init(&member->flag_mutex, SWITCH_MUTEX_NESTED, rec->pool); switch_mutex_init(&member->audio_in_mutex, SWITCH_MUTEX_NESTED, rec->pool); switch_mutex_init(&member->audio_out_mutex, SWITCH_MUTEX_NESTED, rec->pool);