Author: anthm Date: Fri Feb 6 10:03:56 2009 New Revision: 11663 Log: fix regression in previous fix for MODAPP-209 Modified: freeswitch/trunk/libs/esl/testclient.c freeswitch/trunk/scripts/freeswitch-gcore freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/libs/esl/testclient.c ============================================================================== --- freeswitch/trunk/libs/esl/testclient.c (original) +++ freeswitch/trunk/libs/esl/testclient.c Fri Feb 6 10:03:56 2009 @@ -9,7 +9,21 @@ 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); Modified: freeswitch/trunk/scripts/freeswitch-gcore ============================================================================== --- freeswitch/trunk/scripts/freeswitch-gcore (original) +++ freeswitch/trunk/scripts/freeswitch-gcore Fri Feb 6 10:03:56 2009 @@ -9,4 +9,4 @@ --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 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 Fri Feb 6 10:03:56 2009 @@ -2181,6 +2181,7 @@ 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);