From 413b033ca287e6327b16ede2dc60479a3544f7f5 Mon Sep 17 00:00:00 2001 From: Henri Herscher Date: Tue, 21 Aug 2007 14:58:19 +0000 Subject: Start message response can now initiate capture in non-lookback recording mode. Moved non-lookback configuration switch from VoIpPlugin node to the top node. git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@469 09dcff7a-b715-0410-9601-b79a96267cd0 --- orkaudio/audiocaptureplugins/voip/RtpSession.cpp | 13 ++++++++----- orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp | 3 --- orkaudio/audiocaptureplugins/voip/VoIpConfig.h | 2 -- 3 files changed, 8 insertions(+), 10 deletions(-) (limited to 'orkaudio') diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp index d7fab30..19f5fc1 100644 --- a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp +++ b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp @@ -480,7 +480,7 @@ bool RtpSession::AddRtpPacket(RtpPacketInfoRef& rtpPacket) CStdString logMsg; unsigned char channel = 0; - if((DLLCONFIG.m_lookBackRecording == false) && (m_numRtpPackets > 0)) + if((CONFIG.m_lookBackRecording == false) && (m_numRtpPackets > 0)) { if(m_numRtpPackets == 1 && !m_nonLookBackSessionStarted) { @@ -656,7 +656,7 @@ bool RtpSession::AddRtpPacket(RtpPacketInfoRef& rtpPacket) { // We've got enough packets to start the session. // For Raw RTP, the high number is to make sure we have a "real" raw RTP session, not a leftover from a SIP/Skinny session - if(DLLCONFIG.m_lookBackRecording == true) { + if(CONFIG.m_lookBackRecording == true) { Start(); ReportMetadata(); } @@ -764,9 +764,12 @@ bool RtpSession::OrkUidMatches(CStdString &oUid) bool RtpSession::PartyMatches(CStdString &party) { - if(m_localParty.CompareNoCase(party) == 0 || m_remoteParty.CompareNoCase(party) == 0) + if(party.size() > 0) { - return true; + if(m_localParty.CompareNoCase(party) == 0 || m_remoteParty.CompareNoCase(party) == 0) + { + return true; + } } return false; } @@ -1519,7 +1522,7 @@ void RtpSessions::ReportRtpPacket(RtpPacketInfoRef& rtpPacket) } } } - else if((numSessionsFound == 0) && (DLLCONFIG.m_lookBackRecording == true)) + else if((numSessionsFound == 0) && (CONFIG.m_lookBackRecording == true)) { // create new Raw RTP session and insert into IP+Port map CStdString trackingId = m_alphaCounter.GetNext(); diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp index 638f72d..b2a5058 100644 --- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp +++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.cpp @@ -47,7 +47,6 @@ VoIpConfig::VoIpConfig() m_skinnyIgnoreOpenReceiveChannelAck = false; m_skinnyDynamicMediaAddress = false; m_skinnyAllowCallInfoUpdate = false; - m_lookBackRecording = true; m_sangomaEnable = false; m_sangomaRxTcpPortStart = 0; @@ -92,8 +91,6 @@ void VoIpConfig::Define(Serializer* s) s->BoolValue("SkinnyDynamicMediaAddress", m_skinnyDynamicMediaAddress); s->BoolValue("SkinnyAllowCallInfoUpdate", m_skinnyAllowCallInfoUpdate); - s->BoolValue("LookBackRecording", m_lookBackRecording); - s->IntValue("SangomaRxTcpPortStart", m_sangomaRxTcpPortStart); s->IntValue("SangomaTxTcpPortStart", m_sangomaTxTcpPortStart); } diff --git a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h index c1e8b48..7305588 100644 --- a/orkaudio/audiocaptureplugins/voip/VoIpConfig.h +++ b/orkaudio/audiocaptureplugins/voip/VoIpConfig.h @@ -81,8 +81,6 @@ public: bool m_skinnyDynamicMediaAddress; bool m_skinnyAllowCallInfoUpdate; - bool m_lookBackRecording; - std::list m_dnisNumbers; std::list m_sipExtractFields; -- cgit v1.2.3