From 4814cb1e348d34e6aaf945a94e0ce30ae19ac383 Mon Sep 17 00:00:00 2001 From: Mike Jerris Date: Wed, 5 Oct 2016 09:57:16 -0400 Subject: [PATCH] FS-9581: [windows] CF_TEXT is a reserved constant on windows --- src/include/switch_types.h | 2 +- src/mod/endpoints/mod_verto/mod_verto.c | 2 +- src/switch_core_media.c | 14 +++++++------- src/switch_ivr_bridge.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/include/switch_types.h b/src/include/switch_types.h index 7cdcca625c..5ec6823846 100644 --- a/src/include/switch_types.h +++ b/src/include/switch_types.h @@ -1526,7 +1526,7 @@ typedef enum { CF_IMAGE_SDP, CF_VIDEO_SDP_RECVD, CF_TEXT_SDP_RECVD, - CF_TEXT, + CF_TEXT_RTT, CF_TEXT_POSSIBLE, CF_TEXT_PASSIVE, CF_TEXT_ECHO, diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c index 4daf4740e6..a7551e3a08 100644 --- a/src/mod/endpoints/mod_verto/mod_verto.c +++ b/src/mod/endpoints/mod_verto/mod_verto.c @@ -5195,7 +5195,7 @@ static void set_text_funcs(switch_core_session_t *session) switch_buffer_create_dynamic(&tech_pvt->text_read_buffer, 512, 1024, 0); switch_buffer_create_dynamic(&tech_pvt->text_write_buffer, 512, 1024, 0); - switch_channel_set_flag(switch_core_session_get_channel(session), CF_TEXT); + switch_channel_set_flag(switch_core_session_get_channel(session), CF_TEXT_RTT); switch_core_session_start_text_thread(session); } } diff --git a/src/switch_core_media.c b/src/switch_core_media.c index 274ec4dc42..9dbb19e1f0 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -4353,7 +4353,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s smh->msrp_session->local_accept_wrapped_types = smh->msrp_session->remote_accept_types; smh->msrp_session->local_setup = smh->msrp_session->remote_setup; - switch_channel_set_flag(session->channel, CF_TEXT); + switch_channel_set_flag(session->channel, CF_TEXT_RTT); switch_channel_set_flag(session->channel, CF_TEXT_POSSIBLE); switch_channel_set_flag(session->channel, CF_MSRP); @@ -6200,7 +6200,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_start_text_thread(switch_cor switch_rtp_engine_t *t_engine = NULL; switch_media_handle_t *smh; - if (!switch_channel_test_flag(session->channel, CF_TEXT)) { + if (!switch_channel_test_flag(session->channel, CF_TEXT_RTT)) { return SWITCH_STATUS_NOTIMPL; } @@ -6666,7 +6666,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_proxy_remote_addr(switch_core_ if (*rtp) { t_engine->cur_payload_map->remote_sdp_ip = switch_core_session_strdup(session, rip); t_engine->cur_payload_map->remote_sdp_port = (switch_port_t) atoi(rtp); - switch_channel_set_flag(session->channel, CF_TEXT); + switch_channel_set_flag(session->channel, CF_TEXT_RTT); switch_channel_set_flag(session->channel, CF_TEXT_POSSIBLE); } @@ -6713,7 +6713,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_proxy_remote_addr(switch_core_ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Remote text address:port [%s:%d] has not changed.\n", t_engine->cur_payload_map->remote_sdp_ip, t_engine->cur_payload_map->remote_sdp_port); } else { - switch_channel_set_flag(session->channel, CF_TEXT); + switch_channel_set_flag(session->channel, CF_TEXT_RTT); switch_channel_set_flag(session->channel, CF_TEXT_POSSIBLE); if (switch_rtp_ready(t_engine->rtp_session)) { const char *rport = NULL; @@ -7913,7 +7913,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_activate_rtp(switch_core_sessi switch_rtp_set_video_buffer_size(t_engine->rtp_session, 2, 2048); switch_rtp_set_payload_map(t_engine->rtp_session, &t_engine->payload_map); - switch_channel_set_flag(session->channel, CF_TEXT); + switch_channel_set_flag(session->channel, CF_TEXT_RTT); switch_core_session_start_text_thread(session); if ((ssrc = switch_channel_get_variable(session->channel, "rtp_use_text_ssrc"))) { @@ -10044,7 +10044,7 @@ msrp: smh->msrp_session->call_id = switch_core_session_get_uuid(session); - switch_channel_set_flag(session->channel, CF_TEXT); + switch_channel_set_flag(session->channel, CF_TEXT_RTT); switch_channel_set_flag(session->channel, CF_TEXT_POSSIBLE); switch_channel_set_flag(session->channel, CF_MSRP); @@ -13970,7 +13970,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_print(switch_core_session_t //} - if (!switch_channel_test_flag(session->channel, CF_TEXT)) { + if (!switch_channel_test_flag(session->channel, CF_TEXT_RTT)) { return SWITCH_STATUS_NOTIMPL; } diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c index 4030233f62..7738d95753 100644 --- a/src/switch_ivr_bridge.c +++ b/src/switch_ivr_bridge.c @@ -465,7 +465,7 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj) continue; } - if (switch_channel_test_flag(chan_a, CF_TEXT) && switch_channel_test_flag(chan_b, CF_TEXT) && !txt_launch) { + if (switch_channel_test_flag(chan_a, CF_TEXT_RTT) && switch_channel_test_flag(chan_b, CF_TEXT_RTT) && !txt_launch) { txt_launch++; th.session_a = session_a;