diff options
author | perkj@webrtc.org <perkj@webrtc.org> | 2014-11-06 12:16:36 +0000 |
---|---|---|
committer | perkj@webrtc.org <perkj@webrtc.org> | 2014-11-06 12:16:36 +0000 |
commit | 99766a1e81973265d444f71c492960819c12e6e2 (patch) | |
tree | fb63f44f1509440a888e81b5829b4552c6b0f450 | |
parent | 59ad3d2644d79611c666559828dd9e5319698679 (diff) | |
download | talk-99766a1e81973265d444f71c492960819c12e6e2.tar.gz |
Remove deprecated PeerConnection APIs.
Removes PeerConnectionObserver::OnError.
Removes MediaConstraints argument to PeerConnection::AddStream.
None of these have ever been implemented and have been removed from the spec.
R=tommi@chromium.org
Review URL: https://webrtc-codereview.appspot.com/24189004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7650 4adac7df-926f-26a2-2b94-8c16560cd09d
-rw-r--r-- | app/webrtc/peerconnection.cc | 5 | ||||
-rw-r--r-- | app/webrtc/peerconnection.h | 2 | ||||
-rw-r--r-- | app/webrtc/peerconnectioninterface.h | 14 | ||||
-rw-r--r-- | app/webrtc/peerconnectionproxy.h | 2 |
4 files changed, 1 insertions, 22 deletions
diff --git a/app/webrtc/peerconnection.cc b/app/webrtc/peerconnection.cc index b64caf7..64ddcad 100644 --- a/app/webrtc/peerconnection.cc +++ b/app/webrtc/peerconnection.cc @@ -420,11 +420,6 @@ bool PeerConnection::AddStream(MediaStreamInterface* local_stream) { return true; } -bool PeerConnection::AddStream(MediaStreamInterface* local_stream, - const MediaConstraintsInterface* constraints) { - return AddStream(local_stream); -} - void PeerConnection::RemoveStream(MediaStreamInterface* local_stream) { mediastream_signaling_->RemoveLocalStream(local_stream); if (IsClosed()) { diff --git a/app/webrtc/peerconnection.h b/app/webrtc/peerconnection.h index 355211c..68aa154 100644 --- a/app/webrtc/peerconnection.h +++ b/app/webrtc/peerconnection.h @@ -66,8 +66,6 @@ class PeerConnection : public PeerConnectionInterface, virtual rtc::scoped_refptr<StreamCollectionInterface> local_streams(); virtual rtc::scoped_refptr<StreamCollectionInterface> remote_streams(); virtual bool AddStream(MediaStreamInterface* local_stream); - virtual bool AddStream(MediaStreamInterface* local_stream, - const MediaConstraintsInterface* constraints); virtual void RemoveStream(MediaStreamInterface* local_stream); virtual rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender( diff --git a/app/webrtc/peerconnectioninterface.h b/app/webrtc/peerconnectioninterface.h index 68b7879..73a4812 100644 --- a/app/webrtc/peerconnectioninterface.h +++ b/app/webrtc/peerconnectioninterface.h @@ -255,15 +255,7 @@ class PeerConnectionInterface : public rtc::RefCountInterface { // 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. - // TODO(perkj): Make pure virtual once Chrome mocks have implemented. - virtual bool AddStream(MediaStreamInterface* stream) { return false;} - - // Deprecated: - // TODO(perkj): Remove once its not used by Chrome. - virtual bool AddStream(MediaStreamInterface* stream, - const MediaConstraintsInterface* constraints) { - return false; - } + virtual bool AddStream(MediaStreamInterface* stream) = 0; // Remove a MediaStream from this PeerConnection. // Note that a SessionDescription negotiation is need before the @@ -351,10 +343,6 @@ class PeerConnectionObserver { kIceState, }; - // Deprecated. - // TODO(perkj): Remove once its not used by Chrome. - virtual void OnError() {} - // Triggered when the SignalingState changed. virtual void OnSignalingChange( PeerConnectionInterface::SignalingState new_state) {} diff --git a/app/webrtc/peerconnectionproxy.h b/app/webrtc/peerconnectionproxy.h index 571c676..852d852 100644 --- a/app/webrtc/peerconnectionproxy.h +++ b/app/webrtc/peerconnectionproxy.h @@ -40,8 +40,6 @@ BEGIN_PROXY_MAP(PeerConnection) PROXY_METHOD0(rtc::scoped_refptr<StreamCollectionInterface>, remote_streams) PROXY_METHOD1(bool, AddStream, MediaStreamInterface*) - PROXY_METHOD2(bool, AddStream, MediaStreamInterface*, - const MediaConstraintsInterface*); PROXY_METHOD1(void, RemoveStream, MediaStreamInterface*) PROXY_METHOD1(rtc::scoped_refptr<DtmfSenderInterface>, CreateDtmfSender, AudioTrackInterface*) |