From d5f41ce89899abf47cd015ccc52524d467e0eb44 Mon Sep 17 00:00:00 2001 From: deadbeef Date: Wed, 8 Jun 2016 13:31:45 -0700 Subject: [PATCH] Use the new versions of OnAddStream/OnRemoveStream in objc binding. Review-Url: https://codereview.webrtc.org/2049153002 Cr-Commit-Position: refs/heads/master@{#13078} --- .../sdk/objc/Framework/Classes/RTCPeerConnection+Private.h | 7 ++++--- webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Private.h b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Private.h index 92bdfa3bf5..60ab868a7c 100644 --- a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Private.h +++ b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Private.h @@ -29,11 +29,12 @@ class PeerConnectionDelegateAdapter : public PeerConnectionObserver { void OnSignalingChange( PeerConnectionInterface::SignalingState new_state) override; - void OnAddStream(MediaStreamInterface *stream) override; + void OnAddStream(rtc::scoped_refptr stream) override; - void OnRemoveStream(MediaStreamInterface *stream) override; + void OnRemoveStream(rtc::scoped_refptr stream) override; - void OnDataChannel(DataChannelInterface *data_channel) override; + void OnDataChannel( + rtc::scoped_refptr data_channel) override; void OnRenegotiationNeeded() override; diff --git a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm index 3fcc652e69..68d23874bd 100644 --- a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm +++ b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm @@ -126,7 +126,7 @@ void PeerConnectionDelegateAdapter::OnSignalingChange( } void PeerConnectionDelegateAdapter::OnAddStream( - MediaStreamInterface *stream) { + rtc::scoped_refptr stream) { RTCMediaStream *mediaStream = [[RTCMediaStream alloc] initWithNativeMediaStream:stream]; RTCPeerConnection *peer_connection = peer_connection_; @@ -135,7 +135,7 @@ void PeerConnectionDelegateAdapter::OnAddStream( } void PeerConnectionDelegateAdapter::OnRemoveStream( - MediaStreamInterface *stream) { + rtc::scoped_refptr stream) { RTCMediaStream *mediaStream = [[RTCMediaStream alloc] initWithNativeMediaStream:stream]; RTCPeerConnection *peer_connection = peer_connection_; @@ -144,7 +144,7 @@ void PeerConnectionDelegateAdapter::OnRemoveStream( } void PeerConnectionDelegateAdapter::OnDataChannel( - DataChannelInterface *data_channel) { + rtc::scoped_refptr data_channel) { RTCDataChannel *dataChannel = [[RTCDataChannel alloc] initWithNativeDataChannel:data_channel]; RTCPeerConnection *peer_connection = peer_connection_;