mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-10-30 23:24:18 +00:00
update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5191 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
4aeecd93b5
commit
dc4f3fd903
4 files changed
+11
-12
No files matched your search
+6
-8
@@ -749,7 +749,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_media(char *uuid, switch_media_flag_t
|
||||
|
||||
if (switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) {
|
||||
status = SWITCH_STATUS_SUCCESS;
|
||||
switch_channel_clear_flag(channel, CF_BYPASS_MEDIA);
|
||||
switch_core_session_receive_message(session, &msg);
|
||||
|
||||
if ((flags & SMF_REBRIDGE)
|
||||
@@ -765,7 +764,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_media(char *uuid, switch_media_flag_t
|
||||
switch_channel_clear_state_handler(channel, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
switch_core_session_rwunlock(session);
|
||||
|
||||
if (other_channel) {
|
||||
@@ -803,22 +802,21 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_nomedia(char *uuid, switch_media_flag
|
||||
}
|
||||
|
||||
if ((flags & SMF_FORCE) || !switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) {
|
||||
switch_ivr_parse_all_events(session);
|
||||
|
||||
//switch_ivr_parse_all_events(session);
|
||||
switch_core_session_receive_message(session, &msg);
|
||||
|
||||
if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) &&
|
||||
(other_session = switch_core_session_locate(other_uuid))) {
|
||||
other_channel = switch_core_session_get_channel(other_session);
|
||||
assert(other_channel != NULL);
|
||||
|
||||
switch_ivr_parse_all_events(other_session);
|
||||
//switch_ivr_parse_all_events(other_session);
|
||||
|
||||
switch_core_session_receive_message(other_session, &msg);
|
||||
switch_channel_clear_state_handler(other_channel, NULL);
|
||||
|
||||
}
|
||||
|
||||
switch_channel_set_flag(channel, CF_BYPASS_MEDIA);
|
||||
switch_core_session_receive_message(session, &msg);
|
||||
|
||||
|
||||
if (other_channel) {
|
||||
switch_channel_clear_state_handler(channel, NULL);
|
||||
|
||||
Reference in new issue
Block a user