Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Side by Side Diff: webrtc/examples/peerconnection/client/conductor.h

Issue 1972793003: Use scoped_refptr for On(Add|Remove)Stream and OnDataChannel. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Adding "deprecated" comments. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2012 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 void EnsureStreamingUI(); 60 void EnsureStreamingUI();
61 void AddStreams(); 61 void AddStreams();
62 cricket::VideoCapturer* OpenVideoCaptureDevice(); 62 cricket::VideoCapturer* OpenVideoCaptureDevice();
63 63
64 // 64 //
65 // PeerConnectionObserver implementation. 65 // PeerConnectionObserver implementation.
66 // 66 //
67 67
68 void OnSignalingChange( 68 void OnSignalingChange(
69 webrtc::PeerConnectionInterface::SignalingState new_state) override{}; 69 webrtc::PeerConnectionInterface::SignalingState new_state) override{};
70 void OnAddStream(webrtc::MediaStreamInterface* stream) override; 70 void OnAddStream(
71 void OnRemoveStream(webrtc::MediaStreamInterface* stream) override; 71 rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) override;
72 void OnDataChannel(webrtc::DataChannelInterface* channel) override {} 72 void OnRemoveStream(
73 rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) override;
74 void OnDataChannel(
75 rtc::scoped_refptr<webrtc::DataChannelInterface> channel) override {}
73 void OnRenegotiationNeeded() override {} 76 void OnRenegotiationNeeded() override {}
74 void OnIceConnectionChange( 77 void OnIceConnectionChange(
75 webrtc::PeerConnectionInterface::IceConnectionState new_state) override{}; 78 webrtc::PeerConnectionInterface::IceConnectionState new_state) override{};
76 void OnIceGatheringChange( 79 void OnIceGatheringChange(
77 webrtc::PeerConnectionInterface::IceGatheringState new_state) override{}; 80 webrtc::PeerConnectionInterface::IceGatheringState new_state) override{};
78 void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override; 81 void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override;
79 void OnIceConnectionReceivingChange(bool receiving) override {} 82 void OnIceConnectionReceivingChange(bool receiving) override {}
80 83
81 // 84 //
82 // PeerConnectionClientObserver implementation. 85 // PeerConnectionClientObserver implementation.
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 peer_connection_factory_; 128 peer_connection_factory_;
126 PeerConnectionClient* client_; 129 PeerConnectionClient* client_;
127 MainWindow* main_wnd_; 130 MainWindow* main_wnd_;
128 std::deque<std::string*> pending_messages_; 131 std::deque<std::string*> pending_messages_;
129 std::map<std::string, rtc::scoped_refptr<webrtc::MediaStreamInterface> > 132 std::map<std::string, rtc::scoped_refptr<webrtc::MediaStreamInterface> >
130 active_streams_; 133 active_streams_;
131 std::string server_; 134 std::string server_;
132 }; 135 };
133 136
134 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ 137 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698