Author: mikej Date: Wed Jan 2 13:20:28 2008 New Revision: 7064 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_async.c Log: make echo work from event socket (MODEVENT-10) Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Wed Jan 2 13:20:28 2008 @@ -1018,13 +1018,6 @@ SWITCH_STANDARD_APP(echo_function) { - switch_channel_t *channel; - - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - - switch_channel_pre_answer(channel); - switch_ivr_session_echo(session); } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Wed Jan 2 13:20:28 2008 @@ -68,7 +68,6 @@ switch_channel_t *channel = switch_core_session_get_channel(session); switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; - switch_channel_pre_answer(channel); @@ -80,7 +79,7 @@ switch_thread_create(&thread, thd_attr, echo_video_thread, &eh, switch_core_session_get_pool(session)); } - while(switch_channel_ready(channel) && switch_channel_get_state(channel) == CS_LOOPBACK) { + while(switch_channel_ready(channel)) { status = switch_core_session_read_frame(session, &read_frame, -1, 0); if (!SWITCH_READ_ACCEPTABLE(status)) { break;