From c6c0018a70abc31f44842ae12184a29f8c7f657a Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> Date: Mon, 8 Sep 2014 23:15:38 -0400 Subject: [PATCH] sipaccountbase: fix build for --disable-video Refs #53127 Change-Id: Id30c350618d7658f04014d255af92a580b85fd5c --- daemon/src/sip/sipaccountbase.cpp | 2 -- daemon/src/sip/sipaccountbase.h | 4 ---- 2 files changed, 6 deletions(-) diff --git a/daemon/src/sip/sipaccountbase.cpp b/daemon/src/sip/sipaccountbase.cpp index 84608c36c1..3314c41fa4 100644 --- a/daemon/src/sip/sipaccountbase.cpp +++ b/daemon/src/sip/sipaccountbase.cpp @@ -161,9 +161,7 @@ void SIPAccountBase::unserialize(const YAML::Node &node) parseValue(srtpMap, RTP_FALLBACK_KEY, srtpFallback_); unserializeRange(node, AUDIO_PORT_MIN_KEY, AUDIO_PORT_MAX_KEY, audioPortRange_); -#ifdef SFL_VIDEO unserializeRange(node, VIDEO_PORT_MIN_KEY, VIDEO_PORT_MAX_KEY, videoPortRange_); -#endif } diff --git a/daemon/src/sip/sipaccountbase.h b/daemon/src/sip/sipaccountbase.h index 0cdf549b3f..5cf8498102 100644 --- a/daemon/src/sip/sipaccountbase.h +++ b/daemon/src/sip/sipaccountbase.h @@ -101,10 +101,8 @@ namespace Conf { const char *const CRED_KEY = "credential"; const char *const AUDIO_PORT_MIN_KEY = "audioPortMin"; const char *const AUDIO_PORT_MAX_KEY = "audioPortMax"; -#ifdef SFL_VIDEO const char *const VIDEO_PORT_MIN_KEY = "videoPortMin"; const char *const VIDEO_PORT_MAX_KEY = "videoPortMax"; -#endif } class SIPVoIPLink; @@ -385,12 +383,10 @@ protected: */ std::pair<uint16_t, uint16_t> audioPortRange_ {16384, 32766}; -#ifdef SFL_VIDEO /** * Port range for video RTP ports */ std::pair<uint16_t, uint16_t> videoPortRange_ {49152, (MAX_PORT) - 2}; -#endif static bool portsInUse_[HALF_MAX_PORT]; static uint16_t getRandomEvenNumber(const std::pair<uint16_t, uint16_t> &range); -- GitLab