From f3af752fe08a4d70b0e9d5b9952f4a8395d3f85f Mon Sep 17 00:00:00 2001
From: Tristan Matthews <le.businessman@gmail.com>
Date: Sat, 28 Apr 2012 17:42:23 -0400
Subject: [PATCH] * #9832: AudioRtpFactory: cleanup logging
---
daemon/src/audio/audiortp/audio_rtp_factory.cpp | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/daemon/src/audio/audiortp/audio_rtp_factory.cpp b/daemon/src/audio/audiortp/audio_rtp_factory.cpp
index 4747834738..387f227f3f 100644
--- a/daemon/src/audio/audiortp/audio_rtp_factory.cpp
+++ b/daemon/src/audio/audiortp/audio_rtp_factory.cpp
@@ -28,8 +28,6 @@
* as that of the covered work.
*/
-
-
#include "audio_rtp_factory.h"
#include "audio_zrtp_session.h"
#include "audio_srtp_session.h"
@@ -112,13 +110,13 @@ void AudioRtpFactory::initSession()
void AudioRtpFactory::start(AudioCodec* audiocodec)
{
if (rtpSession_ == NULL)
- throw AudioRtpFactoryException("AudioRtpFactory: Error: RTP session was null when trying to start audio thread");
+ throw AudioRtpFactoryException("RTP session was null when trying to start audio thread");
if (keyExchangeProtocol_ == SDES and cachedLocalContext_ and cachedRemoteContext_)
static_cast<AudioSrtpSession *>(rtpSession_)->restoreCryptoContext(cachedLocalContext_, cachedRemoteContext_);
if (rtpSession_->startRtpThread(*audiocodec) != 0)
- throw AudioRtpFactoryException("AudioRtpFactory: Error: Failed to start AudioRtpSession thread");
+ throw AudioRtpFactoryException("Failed to start AudioRtpSession thread");
}
void AudioRtpFactory::stop()
@@ -132,7 +130,7 @@ void AudioRtpFactory::stop()
int AudioRtpFactory::getSessionMedia()
{
if (rtpSession_ == NULL)
- throw AudioRtpFactoryException("AudioRtpFactory: Error: RTP session was null when trying to get session media type");
+ throw AudioRtpFactoryException("RTP session was null when trying to get session media type");
return rtpSession_->getCodecPayloadType();
}
@@ -140,7 +138,7 @@ int AudioRtpFactory::getSessionMedia()
void AudioRtpFactory::updateSessionMedia(AudioCodec *audiocodec)
{
if (rtpSession_ == NULL)
- throw AudioRtpFactoryException("AudioRtpFactory: Error: rtpSession_ was null when trying to update IP address");
+ throw AudioRtpFactoryException("rtpSession_ was NULL when trying to update IP address");
rtpSession_->updateSessionMedia(*audiocodec);
}
@@ -156,7 +154,7 @@ sfl::AudioZrtpSession * AudioRtpFactory::getAudioZrtpSession()
if (keyExchangeProtocol_ == ZRTP)
return static_cast<AudioZrtpSession *>(rtpSession_);
else
- throw AudioRtpFactoryException("RTP: Error: rtpSession_ is NULL in getAudioZrtpSession");
+ throw AudioRtpFactoryException("rtpSession_ is NULL in getAudioZrtpSession");
}
void sfl::AudioRtpFactory::initLocalCryptoInfo()
--
GitLab