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

add FLAG_TERMINATING to trigger normal and unexpected (abnormal) session termination 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5635 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Arsen Chaloyan 2007-08-20 19:09:19 +00:00
parent a56dba7f8a
commit 0c59cb0d51
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c
View File

@ -99,7 +99,8 @@ typedef enum {
FLAG_BARGE = (1 << 1), FLAG_BARGE = (1 << 1),
FLAG_READY = (1 << 2), FLAG_READY = (1 << 2),
FLAG_SPEAK_COMPLETE = (1 << 3), FLAG_SPEAK_COMPLETE = (1 << 3),
FLAG_FEED_STARTED = (1 << 4) FLAG_FEED_STARTED = (1 << 4),
FLAG_TERMINATING = (1 << 5)
} mrcp_flag_t; } mrcp_flag_t;
typedef struct { typedef struct {
@ -173,7 +174,13 @@ static mrcp_status_t openmrcp_on_session_terminate(mrcp_client_context_t *contex
if(!openmrcp_session) { if(!openmrcp_session) {
return MRCP_STATUS_FAILURE; return MRCP_STATUS_FAILURE;
} }
if (switch_test_flag(openmrcp_session, FLAG_TERMINATING)) {
openmrcp_session_destroy(openmrcp_session); openmrcp_session_destroy(openmrcp_session);
}
else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "abnormal session terminate\n");
}
return MRCP_STATUS_SUCCESS; return MRCP_STATUS_SUCCESS;
} }
@ -436,6 +443,7 @@ static switch_status_t openmrcp_asr_close(switch_asr_handle_t *ah, switch_asr_fl
// terminate client session // terminate client session
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Going to TERMINATE SESSION\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Going to TERMINATE SESSION\n");
switch_set_flag_locked(asr_session, FLAG_TERMINATING);
mrcp_client_context_session_terminate(context, asr_session->client_session); mrcp_client_context_session_terminate(context, asr_session->client_session);
switch_set_flag(ah, SWITCH_ASR_FLAG_CLOSED); switch_set_flag(ah, SWITCH_ASR_FLAG_CLOSED);
@ -605,6 +613,7 @@ static switch_status_t openmrcp_tts_close(switch_speech_handle_t *sh, switch_spe
/* terminate tts session */ /* terminate tts session */
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "terminate tts_session\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "terminate tts_session\n");
switch_set_flag_locked(tts_session, FLAG_TERMINATING);
mrcp_client_context_session_terminate(context,tts_session->client_session); mrcp_client_context_session_terminate(context,tts_session->client_session);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }