Commit a28a8f63 authored by Guillaume Roguez's avatar Guillaume Roguez

fix build on gcc below v5.2

gcc below 5.2 doesn't support usage of std::unique_ptr as method argument
with a default assignement to nullptr if the type is forward declared.

This patch is a quick fix, that remove the default assignement and
force the value where needed.

Change-Id: If619dceaed9cca9c9f00f3b9b3f92c768f2c1135
parent aa47a9bf
......@@ -41,8 +41,8 @@ class AudioRtpSession : public RtpSession {
AudioRtpSession(const std::string& id);
virtual ~AudioRtpSession();
void start(std::unique_ptr<IceSocket> rtp_sock = nullptr,
std::unique_ptr<IceSocket> rtcp_sock = nullptr) override;
void start(std::unique_ptr<IceSocket> rtp_sock,
std::unique_ptr<IceSocket> rtcp_sock) override;
void restartSender() override;
void restartReceiver() override;
void stop() override;
......
......@@ -31,13 +31,15 @@
namespace ring {
class IceSocket;
class RtpSession {
public:
RtpSession(const std::string &callID) : callID_(callID) {}
virtual ~RtpSession() {};
virtual void start(std::unique_ptr<IceSocket> rtp_sock = nullptr,
std::unique_ptr<IceSocket> rtcp_sock = nullptr) = 0;
virtual void start(std::unique_ptr<IceSocket> rtp_sock,
std::unique_ptr<IceSocket> rtcp_sock) = 0;
virtual void restartSender() = 0;
virtual void restartReceiver() = 0;
virtual void stop() = 0;
......
......@@ -59,8 +59,8 @@ public:
const DeviceParams& localVideoParams);
~VideoRtpSession();
void start(std::unique_ptr<IceSocket> rtp_sock = nullptr,
std::unique_ptr<IceSocket> rtcp_sock = nullptr) override;
void start(std::unique_ptr<IceSocket> rtp_sock,
std::unique_ptr<IceSocket> rtcp_sock) override;
void restartSender() override;
void restartReceiver() override;
void stop() override;
......
......@@ -861,7 +861,7 @@ SIPCall::startAllMedia()
newIceSocket(ice_comp_id + 1));
ice_comp_id += 2;
} else
rtp->start();
rtp->start(nullptr, nullptr);
}
switch (local.type) {
......
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