diff options
Diffstat (limited to 'app/webrtc/objc')
-rw-r--r-- | app/webrtc/objc/RTCPeerConnection.mm | 6 | ||||
-rw-r--r-- | app/webrtc/objc/RTCPeerConnectionObserver.h | 2 | ||||
-rw-r--r-- | app/webrtc/objc/RTCPeerConnectionObserver.mm | 4 | ||||
-rw-r--r-- | app/webrtc/objc/public/RTCPeerConnection.h | 3 | ||||
-rw-r--r-- | app/webrtc/objc/public/RTCPeerConnectionDelegate.h | 3 |
5 files changed, 3 insertions, 15 deletions
diff --git a/app/webrtc/objc/RTCPeerConnection.mm b/app/webrtc/objc/RTCPeerConnection.mm index 72ba373..925de73 100644 --- a/app/webrtc/objc/RTCPeerConnection.mm +++ b/app/webrtc/objc/RTCPeerConnection.mm @@ -151,10 +151,8 @@ class RTCStatsObserver : public StatsObserver { return self.peerConnection->AddIceCandidate(iceCandidate.get()); } -- (BOOL)addStream:(RTCMediaStream*)stream - constraints:(RTCMediaConstraints*)constraints { - BOOL ret = self.peerConnection->AddStream(stream.mediaStream, - constraints.constraints); +- (BOOL)addStream:(RTCMediaStream*)stream { + BOOL ret = self.peerConnection->AddStream(stream.mediaStream); if (!ret) { return NO; } diff --git a/app/webrtc/objc/RTCPeerConnectionObserver.h b/app/webrtc/objc/RTCPeerConnectionObserver.h index f66b567..8378ff8 100644 --- a/app/webrtc/objc/RTCPeerConnectionObserver.h +++ b/app/webrtc/objc/RTCPeerConnectionObserver.h @@ -41,8 +41,6 @@ class RTCPeerConnectionObserver : public PeerConnectionObserver { RTCPeerConnectionObserver(RTCPeerConnection* peerConnection); virtual ~RTCPeerConnectionObserver(); - virtual void OnError() OVERRIDE; - // Triggered when the SignalingState changed. virtual void OnSignalingChange( PeerConnectionInterface::SignalingState new_state) OVERRIDE; diff --git a/app/webrtc/objc/RTCPeerConnectionObserver.mm b/app/webrtc/objc/RTCPeerConnectionObserver.mm index a0206e5..f4cab7f 100644 --- a/app/webrtc/objc/RTCPeerConnectionObserver.mm +++ b/app/webrtc/objc/RTCPeerConnectionObserver.mm @@ -46,10 +46,6 @@ RTCPeerConnectionObserver::RTCPeerConnectionObserver( RTCPeerConnectionObserver::~RTCPeerConnectionObserver() { } -void RTCPeerConnectionObserver::OnError() { - [_peerConnection.delegate peerConnectionOnError:_peerConnection]; -} - void RTCPeerConnectionObserver::OnSignalingChange( PeerConnectionInterface::SignalingState new_state) { RTCSignalingState state = diff --git a/app/webrtc/objc/public/RTCPeerConnection.h b/app/webrtc/objc/public/RTCPeerConnection.h index 32a9830..6d47f77 100644 --- a/app/webrtc/objc/public/RTCPeerConnection.h +++ b/app/webrtc/objc/public/RTCPeerConnection.h @@ -64,8 +64,7 @@ // Add a new MediaStream to be sent on this PeerConnection. // Note that a SessionDescription negotiation is needed before the // remote peer can receive the stream. -- (BOOL)addStream:(RTCMediaStream *)stream - constraints:(RTCMediaConstraints *)constraints; +- (BOOL)addStream:(RTCMediaStream *)stream; // Remove a MediaStream from this PeerConnection. // Note that a SessionDescription negotiation is need before the diff --git a/app/webrtc/objc/public/RTCPeerConnectionDelegate.h b/app/webrtc/objc/public/RTCPeerConnectionDelegate.h index 4b177d5..ee6ec7a 100644 --- a/app/webrtc/objc/public/RTCPeerConnectionDelegate.h +++ b/app/webrtc/objc/public/RTCPeerConnectionDelegate.h @@ -38,9 +38,6 @@ // implemented to get messages from PeerConnection. @protocol RTCPeerConnectionDelegate<NSObject> -// Triggered when there is an error. -- (void)peerConnectionOnError:(RTCPeerConnection *)peerConnection; - // Triggered when the SignalingState changed. - (void)peerConnection:(RTCPeerConnection *)peerConnection signalingStateChanged:(RTCSignalingState)stateChanged; |