diff options
| author | Henri Herscher <henri@oreka.org> | 2009-06-22 20:23:10 +0000 |
|---|---|---|
| committer | Henri Herscher <henri@oreka.org> | 2009-06-22 20:23:10 +0000 |
| commit | 79bc58f84cecf79b2f451f4488adb4460b0f0d92 (patch) | |
| tree | 343e7b318b1d4a8fd9a907888676ae9e25dc37f3 | |
| parent | 4501ab5c6cfc68fb2f2a958e39bbc47487c1826d (diff) | |
Added LocalPartyUseName configuration parameter.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@623 09dcff7a-b715-0410-9601-b79a96267cd0
| -rw-r--r-- | orkaudio/audiocaptureplugins/voip/RtpSession.cpp | 3 | ||||
| -rw-r--r-- | orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp | 2 | ||||
| -rw-r--r-- | orkaudio/audiocaptureplugins/voip/VoIpConfig.h | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp index 479e0c8..666030d 100644 --- a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp +++ b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp @@ -705,8 +705,9 @@ void RtpSession::ReportMetadata() // Report Local party CaptureEventRef event(new CaptureEvent()); event->m_type = CaptureEvent::EtLocalParty; + // TODO, we might consider deprecating m_skinnyNameAsLocalParty in favour of m_localPartyUseName at some point if( ( m_protocol == ProtSkinny && DLLCONFIG.m_skinnyNameAsLocalParty == true && m_localPartyName.size() ) || - ( DLLCONFIG.m_partiesUseName == true && m_localPartyName.size() ) ) + ( (DLLCONFIG.m_partiesUseName || DLLCONFIG.m_localPartyUseName) == true && m_localPartyName.size() ) ) { event->m_value = m_localPartyName; } diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp index 17e868b..5f4646d 100644 --- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp +++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp @@ -56,6 +56,7 @@ VoIpConfig::VoIpConfig() m_useMacIfNoLocalParty = false; // Uses IP address by default m_localPartyForceLocalIp = false; m_localPartyForceLocalMac = false; + m_localPartyUseName = false; m_partiesUseName = false; m_skinnyIgnoreStopMediaTransmission = false; @@ -128,6 +129,7 @@ void VoIpConfig::Define(Serializer* s) s->BoolValue("UseMacIfNoLocalParty", m_useMacIfNoLocalParty); s->BoolValue("LocalPartyForceLocalIp", m_localPartyForceLocalIp); s->BoolValue("LocalPartyForceLocalMac", m_localPartyForceLocalMac); + s->BoolValue("LocalPartyUseName", m_localPartyUseName); s->BoolValue("PartiesUseName", m_partiesUseName); s->BoolValue("SkinnyIgnoreStopMediaTransmission", m_skinnyIgnoreStopMediaTransmission); diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h index b83bd8e..202b92f 100644 --- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h +++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h @@ -93,6 +93,7 @@ public: bool m_useMacIfNoLocalParty; bool m_localPartyForceLocalIp; bool m_localPartyForceLocalMac; + bool m_localPartyUseName; bool m_partiesUseName; bool m_skinnyIgnoreStopMediaTransmission; |