kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 17:38:59 +00:00
Code Issues Projects Releases Wiki Activity

numerous fixes from regression testing

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11104 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2009-01-09 20:34:01 +00:00
parent 2b5f146373
commit ea5c385281
20 changed files with 401 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/switch_ivr_originate.c
View File

@@ -501,9 +501,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_wait_for_answer(switch_core_session_t
}
olen = mlen;
if (ringback.fh->resampler && ringback.fh->resampler->rfactor > 1) {
olen = (switch_size_t) (olen * ringback.fh->resampler->rfactor);
}
//if (ringback.fh->resampler && ringback.fh->resampler->rfactor > 1) {
//olen = (switch_size_t) (olen * ringback.fh->resampler->rfactor);
//}
switch_core_file_read(ringback.fh, write_frame.data, &olen);
if (olen == 0) {
@@ -547,7 +547,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_wait_for_answer(switch_core_session_t
switch_buffer_destroy(&ringback.audio_buffer);
}
switch_core_session_reset(session, SWITCH_TRUE);
switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
if (write_codec.implementation) {
switch_core_codec_destroy(&write_codec);
@@ -1128,7 +1128,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
continue;
}
switch_core_session_read_lock(new_session);
if (switch_core_session_read_lock(new_session) != SWITCH_STATUS_SUCCESS) {
status = SWITCH_STATUS_FALSE;
goto done;
}
pool = NULL;
caller_profiles[i] = new_profile;
@@ -1473,9 +1476,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
}
olen = mlen;
if (ringback.fh->resampler && ringback.fh->resampler->rfactor > 1) {
olen = (switch_size_t) (olen * ringback.fh->resampler->rfactor);
}
//if (ringback.fh->resampler && ringback.fh->resampler->rfactor > 1) {
//olen = (switch_size_t) (olen * ringback.fh->resampler->rfactor);
//}
switch_core_file_read(ringback.fh, write_frame.data, &olen);
@@ -1527,7 +1531,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
if (session && (ringback_data || !(switch_channel_test_flag(caller_channel, CF_PROXY_MODE) &&
switch_channel_test_flag(caller_channel, CF_PROXY_MEDIA)))) {
switch_core_session_reset(session, SWITCH_FALSE);
switch_core_session_reset(session, SWITCH_FALSE, SWITCH_TRUE);
}
for (i = 0; i < and_argc; i++) {
@@ -1716,7 +1720,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
}
if (session) {
switch_core_session_reset(session, SWITCH_FALSE);
switch_core_session_reset(session, SWITCH_FALSE, SWITCH_TRUE);
}
if (write_codec.implementation) {