ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-23 20:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge 14453-14455, last minute build and skypiax fixes from trunk

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/tags/1.0.4@14456 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris
2009-08-01 20:00:18 +00:00
parent 17b994a411
commit f96e26877a
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mod/endpoints/mod_skypiax/mod_skypiax.c
+8 -1
View File
@@ -1782,7 +1782,14 @@ int skypiax_answer(private_t * tech_pvt, char *id, char *value)
("FOUND (name=%s, giovatech->interface_state=%d != SKYPIAX_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->callid_number=%s == value=%s)\n",
SKYPIAX_P_LOG, giovatech->name, giovatech->interface_state,
giovatech->skype_user, tech_pvt->skype_user, giovatech->callid_number, value)
break;
if(tech_pvt->interface_state == SKYPIAX_STATE_PRERING){
tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
}else if (tech_pvt->interface_state != 0 && tech_pvt->interface_state != SKYPIAX_STATE_DOWN) {
WARNINGA("Why an interface_state %d HERE?\n", SKYPIAX_P_LOG, tech_pvt->interface_state);
tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
}
break;
}
}
}
src/switch_ivr_async.c
+1 -1
View File
@@ -2074,8 +2074,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_detect_speech(switch_core_session_t *
switch_asr_flag_t flags = SWITCH_ASR_FLAG_NONE;
struct speech_thread_handle *sth = switch_channel_get_private(channel, SWITCH_SPEECH_KEY);
switch_codec_implementation_t read_impl = {0};
switch_core_session_get_read_impl(session, &read_impl);
const char *p;
switch_core_session_get_read_impl(session, &read_impl);
if (!ah) {
if (!(ah = switch_core_session_alloc(session, sizeof(*ah)))) {