diff --git a/sflphone-common/src/audio/audiortp/AudioRtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioRtpSession.cpp index 0979b9417cae53c63915dcde563da26ebf087143..8820d4180a4074713e36529939504767d478b330 100644 --- a/sflphone-common/src/audio/audiortp/AudioRtpSession.cpp +++ b/sflphone-common/src/audio/audiortp/AudioRtpSession.cpp @@ -43,12 +43,12 @@ namespace sfl { AudioRtpSession::AudioRtpSession (SIPCall * sipcall, RtpMethod type, ost::RTPDataQueue *queue, ost::Thread *thread) : - _ca (sipcall) - , AudioRtpRecordHandler (sipcall) + AudioRtpRecordHandler (sipcall) + , _ca (sipcall) , _timestamp (0) - , _isStarted (false) , _timestampIncrement (0) , _timestampCount (0) + , _isStarted (false) , _type(type) , _queue(queue) , _thread(thread) diff --git a/sflphone-common/src/audio/audiortp/AudioSymmetricRtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioSymmetricRtpSession.cpp index 876d971b6140e8f5e3026b1c7e1f369ca49cacd4..ced142d43ee56859bcc660f13008a3d7ea062ca0 100644 --- a/sflphone-common/src/audio/audiortp/AudioSymmetricRtpSession.cpp +++ b/sflphone-common/src/audio/audiortp/AudioSymmetricRtpSession.cpp @@ -43,8 +43,8 @@ namespace sfl { AudioSymmetricRtpSession::AudioSymmetricRtpSession (SIPCall * sipcall) : - ost::SymmetricRTPSession (ost::InetHostAddress (sipcall->getLocalIp().c_str()), sipcall->getLocalAudioPort()) - ,AudioRtpSession(sipcall, Symmetric, static_cast<ost::RTPDataQueue *>(this), static_cast<ost::Thread *>(this)) + AudioRtpSession(sipcall, Symmetric, static_cast<ost::RTPDataQueue *>(this), static_cast<ost::Thread *>(this)) + ,ost::SymmetricRTPSession (ost::InetHostAddress (sipcall->getLocalIp().c_str()), sipcall->getLocalAudioPort()) , _rtpThread (new AudioRtpThread (this)) { _info ("AudioSymmetricRtpSession: Setting new RTP session with destination %s:%d", _ca->getLocalIp().c_str(), _ca->getLocalAudioPort()); @@ -65,7 +65,7 @@ void AudioSymmetricRtpSession::final() delete this; } -AudioSymmetricRtpSession::AudioRtpThread::AudioRtpThread (AudioSymmetricRtpSession *session) : rtpSession (session), running (true) +AudioSymmetricRtpSession::AudioRtpThread::AudioRtpThread (AudioSymmetricRtpSession *session) : running (true), rtpSession (session) { _debug ("AudioSymmetricRtpSession: Create new rtp thread"); } diff --git a/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp index ae97150caa940028f8d416d5bd1f6f975e1d0ec8..2320b21fba7b5e8010570883f956cc1a377850b1 100644 --- a/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp +++ b/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp @@ -50,12 +50,12 @@ namespace sfl AudioZrtpSession::AudioZrtpSession (SIPCall * sipcall, const std::string& zidFilename) : // ost::SymmetricZRTPSession (ost::InetHostAddress (sipcall->getLocalIp().c_str()), sipcall->getLocalAudioPort()), - ost::TRTPSessionBase<ost::SymmetricRTPChannel, ost::SymmetricRTPChannel, ost::ZrtpQueue> (ost::InetHostAddress (sipcall->getLocalIp().c_str()), + AudioRtpSession(sipcall, Zrtp, static_cast<ost::RTPDataQueue *>(this), static_cast<ost::Thread *>(this)) + ,ost::TRTPSessionBase<ost::SymmetricRTPChannel, ost::SymmetricRTPChannel, ost::ZrtpQueue> (ost::InetHostAddress (sipcall->getLocalIp().c_str()), sipcall->getLocalAudioPort(), 0, ost::MembershipBookkeeping::defaultMembersHashSize, ost::defaultApplication()) - ,AudioRtpSession(sipcall, Zrtp, static_cast<ost::RTPDataQueue *>(this), static_cast<ost::Thread *>(this)) , _zidFilename (zidFilename) { _debug ("AudioZrtpSession initialized");