reduce flags to buy time. Solaris thinks enum should be int32 not uint32 and cries...

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 3383a9d88cc7ba814606bb3e2187256bb9a135a8..e732bca5977affbebb096ce677e942a5f002b198 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -515,7 +515,6 @@ typedef enum {
     SWITCH_RTP_FLAG_NOBLOCK       - Do not block
     SWITCH_RTP_FLAG_IO            - IO is ready
        SWITCH_RTP_FLAG_USE_TIMER     - Timeout Reads and replace with a CNG Frame
-       SWITCH_RTP_FLAG_TIMER_RECLOCK - Resync the timer to the current clock on slips
        SWITCH_RTP_FLAG_SECURE        - Secure RTP
        SWITCH_RTP_FLAG_AUTOADJ       - Auto-Adjust the dest based on the source
        SWITCH_RTP_FLAG_RAW_WRITE     - Try to forward packets unscathed
@@ -532,7 +531,7 @@ typedef enum {
        SWITCH_RTP_FLAG_NOBLOCK = (1 << 0),
        SWITCH_RTP_FLAG_IO = (1 << 1),
        SWITCH_RTP_FLAG_USE_TIMER = (1 << 2),
-       SWITCH_RTP_FLAG_TIMER_RECLOCK = (1 << 3),
+       SWITCH_RTP_FLAG_RTCP_PASSTHRU = (1 << 3),
        SWITCH_RTP_FLAG_SECURE_SEND = (1 << 4),
        SWITCH_RTP_FLAG_SECURE_RECV = (1 << 5),
        SWITCH_RTP_FLAG_AUTOADJ = (1 << 6),
@@ -559,8 +558,7 @@ typedef enum {
        SWITCH_RTP_FLAG_DEBUG_RTP_READ = (1 << 27),
        SWITCH_RTP_FLAG_DEBUG_RTP_WRITE = (1 << 28),
        SWITCH_RTP_FLAG_VIDEO = (1 << 29),
-       SWITCH_RTP_FLAG_ENABLE_RTCP = (1 << 30),
-       SWITCH_RTP_FLAG_RTCP_PASSTHRU = (1 << 31)
+       SWITCH_RTP_FLAG_ENABLE_RTCP = (1 << 30)
        /* don't add any more 31 is the limit! gotta chnge to an array to add more */
 } switch_rtp_flag_enum_t;
 typedef uint32_t switch_rtp_flag_t;

diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
index 64dcf509063b4c4e7f43cac97d865cc350a6f5f4..b0bfeada979ff8c0fea53baa83b8a5e609f96f70 100644 (file)
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
@@ -1573,22 +1573,8 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
                channel_answer_channel(session);
                break;
        case SWITCH_MESSAGE_INDICATE_BRIDGE:
-               /*
-                  if (tech_pvt->rtp_session && switch_test_flag(tech_pvt->profile, TFLAG_TIMER)) {
-                  switch_rtp_clear_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_USE_TIMER);
-                  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "De-activate timed RTP!\n");
-                  //switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_TIMER_RECLOCK);
-                  }
-                */
                break;
        case SWITCH_MESSAGE_INDICATE_UNBRIDGE:
-               /*
-                  if (tech_pvt->rtp_session && switch_test_flag(tech_pvt->profile, TFLAG_TIMER)) {
-                  switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_USE_TIMER);
-                  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-activate timed RTP!\n");
-                  //switch_rtp_clear_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_TIMER_RECLOCK);
-                  }
-                */
                break;
        default:
                break;