these aren't the droids you're looking for....

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5115 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2007-05-09 19:44:15 +00:00
parent 2f6798fdb8
commit d6efffd9bc
13 changed files with 200 additions and 63 deletions
@@ -61,11 +61,11 @@ static void audio_bridge_function(switch_core_session_t *session, char *data)
do_continue = switch_true(var);
}
if (switch_channel_test_flag(caller_channel, CF_NOMEDIA)
|| ((var = switch_channel_get_variable(caller_channel, "no_media")) && switch_true(var))) {
if (switch_channel_test_flag(caller_channel, CF_BYPASS_MEDIA)
|| ((var = switch_channel_get_variable(caller_channel, SWITCH_BYPASS_MEDIA_VARIABLE)) && switch_true(var))) {
if (!switch_channel_test_flag(caller_channel, CF_ANSWERED)
&& !switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) {
switch_channel_set_flag(caller_channel, CF_NOMEDIA);
switch_channel_set_flag(caller_channel, CF_BYPASS_MEDIA);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already up, delaying point-to-point mode 'till both legs are up.\n");
no_media_bridge = 1;
@@ -107,7 +107,7 @@ static void audio_bridge_function(switch_core_session_t *session, char *data)
switch_ivr_nomedia(switch_core_session_get_uuid(peer_session), SMF_FORCE);
switch_ivr_signal_bridge(session, peer_session);
} else {
if (switch_channel_test_flag(caller_channel, CF_NOMEDIA)) {
if (switch_channel_test_flag(caller_channel, CF_BYPASS_MEDIA)) {
switch_ivr_signal_bridge(session, peer_session);
} else {
switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL);
+1 -1
View File
@@ -102,7 +102,7 @@ static void bcast_function(switch_core_session_t *session, char *data)
}
if (switch_true(switch_channel_get_variable(channel, "no_media"))) {
if (switch_true(switch_channel_get_variable(channel, SWITCH_BYPASS_MEDIA_VARIABLE))) {
switch_core_session_message_t msg = { 0 };
ready = SEND_TYPE_NOMEDIA;