Commit 0e2312d8 authored by Tristan Matthews's avatar Tristan Matthews

* #18776: audiortp: remove unused inheritance..more cleanup

parent 0f318251
......@@ -73,8 +73,7 @@ class AudioRtpSession : public AudioRtpRecordHandler {
virtual std::vector<uint8> getLocalMasterSalt() const = 0;
protected:
ost::RTPDataQueue &queue_;
private:
bool isStarted_;
void prepareRtpReceiveThread(const std::vector<AudioCodec*> &audioCodecs);
......@@ -83,9 +82,10 @@ class AudioRtpSession : public AudioRtpRecordHandler {
*/
void setSessionMedia(const std::vector<AudioCodec*> &codec);
protected:
bool onRTPPacketRecv(ost::IncomingRTPPkt&);
ost::RTPDataQueue &queue_;
SIPCall &call_;
/**
......@@ -106,6 +106,7 @@ class AudioRtpSession : public AudioRtpRecordHandler {
unsigned int transportRate_;
private:
NON_COPYABLE(AudioRtpSession);
virtual void startReceiveThread() = 0;
void startSendThread();
......
......@@ -53,7 +53,7 @@ class SIPCall;
namespace sfl {
class AudioSymmetricRtpSession : public ost::TimerPort, public ost::SymmetricRTPSession, public AudioRtpSession {
class AudioSymmetricRtpSession : public ost::SymmetricRTPSession, public AudioRtpSession {
public:
/**
* Constructor
......
......@@ -50,8 +50,8 @@ namespace sfl {
class ZrtpZidException : public std::runtime_error {
public:
ZrtpZidException(const std::string& str = "") :
std::runtime_error("ZRTP ZID initialization failed." + str) {}
ZrtpZidException(const char *str):
std::runtime_error(str) {}
};
class AudioZrtpSession :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment