From b44036a64de41171d847fc5983f822a1ff5f86bd Mon Sep 17 00:00:00 2001
From: asavard <asavard@asavard-KT378AA-A2L-a6552f.(none)>
Date: Mon, 25 Oct 2010 11:26:19 -0400
Subject: [PATCH] [#4367] Remove Redeclaration of SymetricAudioRtpSession in
rtpfactory
---
sflphone-common/src/audio/audiortp/AudioRtpFactory.h | 3 +++
sflphone-common/src/audio/audiortp/AudioRtpSession.h | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpFactory.h b/sflphone-common/src/audio/audiortp/AudioRtpFactory.h
index 1b2c5b56f9..b5183d67b2 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpFactory.h
+++ b/sflphone-common/src/audio/audiortp/AudioRtpFactory.h
@@ -39,18 +39,21 @@
class SdesNegotiator;
class SIPCall;
+/*
namespace sfl
{
class AudioZrtpSession;
class AudioSrtpSession;
class AudioSymmetricRtpSession;
}
+*/
namespace sfl
{
class AudioZrtpSession;
class AudioSrtpSession;
+class AudioSymmetricRtpSession;
// Possible kind of rtp session
typedef enum RtpMethod {
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpSession.h b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
index 4f17f98bed..2483b56bdc 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpSession.h
+++ b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
@@ -472,7 +472,7 @@ void AudioRtpSession<D>::setSessionTimeouts (void)
static_cast<D*> (this)->setSchedulingTimeout (schedulingTimeout);
static_cast<D*> (this)->setExpireTimeout (expireTimeout);
} catch (...) {
- _debugException ("Initialization failed while setting timeouts");
+ _debugException ("AudioRtpSession: Initialization failed while setting timeouts");
throw AudioRtpSessionException();
}
}
--
GitLab