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

update 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3446 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-11-23 19:13:54 +00:00
parent 3a7a5295af
commit 251d8c45b4
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/switch_ivr.c
View File

@ -1838,6 +1838,8 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
switch_core_session_receive_message(session_a, message); switch_core_session_receive_message(session_a, message);
if (switch_test_flag(message, SCSMF_DYNAMIC)) { if (switch_test_flag(message, SCSMF_DYNAMIC)) {
switch_safe_free(message); switch_safe_free(message);
} else {
message = NULL;
} }
} }
@ -2261,6 +2263,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
char *ringback_data = NULL; char *ringback_data = NULL;
switch_codec_t *read_codec = NULL; switch_codec_t *read_codec = NULL;
uint8_t sent_ring = 0; uint8_t sent_ring = 0;
switch_core_session_message_t *message = NULL;
write_frame.data = fdata; write_frame.data = fdata;
@ -2585,13 +2588,15 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
goto notready; goto notready;
} }
if (session && or_argc == 1 && and_argc == 1) { /* when there is only 1 channel to call and bridge */ if (switch_core_session_dequeue_message(peer_sessions[0], &message) == SWITCH_STATUS_SUCCESS) {
switch_core_session_message_t *message = NULL; if (session && !ringback_data && or_argc == 1 && and_argc == 1) { /* when there is only 1 channel to call and bridge and no ringback */
if (switch_core_session_dequeue_message(peer_sessions[0], &message) == SWITCH_STATUS_SUCCESS) {
switch_core_session_receive_message(session, message); switch_core_session_receive_message(session, message);
if (switch_test_flag(message, SCSMF_DYNAMIC)) { }
switch_safe_free(message);
} if (switch_test_flag(message, SCSMF_DYNAMIC)) {
switch_safe_free(message);
} else {
message = NULL;
} }
} }