Index: webrtc/api/peerconnectionfactoryproxy.h |
diff --git a/webrtc/api/peerconnectionfactoryproxy.h b/webrtc/api/peerconnectionfactoryproxy.h |
index 227a685b7e23b258f8bb33fc3104e21412cb9c98..d41aad25fee8f694b6199031938e6a30681a2558 100644 |
--- a/webrtc/api/peerconnectionfactoryproxy.h |
+++ b/webrtc/api/peerconnectionfactoryproxy.h |
@@ -22,32 +22,21 @@ |
namespace webrtc { |
BEGIN_SIGNALING_PROXY_MAP(PeerConnectionFactory) |
+ PROXY_SIGNALING_THREAD_DESTRUCTOR() |
PROXY_METHOD1(void, SetOptions, const Options&) |
- // Can't use PROXY_METHOD5 because unique_ptr must be moved. |
- // TODO(tommi,hbos): Use of templates to support unique_ptr? |
- rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( |
- const PeerConnectionInterface::RTCConfiguration& a1, |
- const MediaConstraintsInterface* a2, |
- std::unique_ptr<cricket::PortAllocator> a3, |
- std::unique_ptr<rtc::RTCCertificateGeneratorInterface> a4, |
- PeerConnectionObserver* a5) override { |
- return signaling_thread_ |
- ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( |
- RTC_FROM_HERE, |
- rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, |
- this, a1, a2, a3.release(), a4.release(), a5)); |
- } |
- rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( |
- const PeerConnectionInterface::RTCConfiguration& a1, |
- std::unique_ptr<cricket::PortAllocator> a3, |
- std::unique_ptr<rtc::RTCCertificateGeneratorInterface> a4, |
- PeerConnectionObserver* a5) override { |
- return signaling_thread_ |
- ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>( |
- RTC_FROM_HERE, |
- rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, |
- this, a1, a3.release(), a4.release(), a5)); |
- } |
+ PROXY_METHOD5(rtc::scoped_refptr<PeerConnectionInterface>, |
tommi
2017/01/18 12:18:02
nice to get rid of the other hack
|
+ CreatePeerConnection, |
+ const PeerConnectionInterface::RTCConfiguration&, |
+ const MediaConstraintsInterface*, |
+ std::unique_ptr<cricket::PortAllocator>, |
+ std::unique_ptr<rtc::RTCCertificateGeneratorInterface>, |
+ PeerConnectionObserver*); |
+ PROXY_METHOD4(rtc::scoped_refptr<PeerConnectionInterface>, |
+ CreatePeerConnection, |
+ const PeerConnectionInterface::RTCConfiguration&, |
+ std::unique_ptr<cricket::PortAllocator>, |
+ std::unique_ptr<rtc::RTCCertificateGeneratorInterface>, |
+ PeerConnectionObserver*); |
PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, |
CreateLocalMediaStream, const std::string&) |
PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, |
@@ -75,31 +64,7 @@ BEGIN_SIGNALING_PROXY_MAP(PeerConnectionFactory) |
PROXY_METHOD1(bool, StartRtcEventLog, rtc::PlatformFile) |
PROXY_METHOD2(bool, StartRtcEventLog, rtc::PlatformFile, int64_t) |
PROXY_METHOD0(void, StopRtcEventLog) |
- |
- private: |
- rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot( |
- const PeerConnectionInterface::RTCConfiguration& a1, |
- const MediaConstraintsInterface* a2, |
- cricket::PortAllocator* a3, |
- rtc::RTCCertificateGeneratorInterface* a4, |
- PeerConnectionObserver* a5) { |
- std::unique_ptr<cricket::PortAllocator> ptr_a3(a3); |
- std::unique_ptr<rtc::RTCCertificateGeneratorInterface> ptr_a4(a4); |
- return c_->CreatePeerConnection(a1, a2, std::move(ptr_a3), |
- std::move(ptr_a4), a5); |
- } |
- |
- rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot( |
- const PeerConnectionInterface::RTCConfiguration& a1, |
- cricket::PortAllocator* a3, |
- rtc::RTCCertificateGeneratorInterface* a4, |
- PeerConnectionObserver* a5) { |
- std::unique_ptr<cricket::PortAllocator> ptr_a3(a3); |
- std::unique_ptr<rtc::RTCCertificateGeneratorInterface> ptr_a4(a4); |
- return c_->CreatePeerConnection(a1, std::move(ptr_a3), std::move(ptr_a4), |
- a5); |
- } |
- END_SIGNALING_PROXY() |
+END_PROXY_MAP() |
} // namespace webrtc |