| OLD | NEW |
| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 bool ReinitializePeerConnectionForLoopback(); | 57 bool ReinitializePeerConnectionForLoopback(); |
| 58 bool CreatePeerConnection(bool dtls); | 58 bool CreatePeerConnection(bool dtls); |
| 59 void DeletePeerConnection(); | 59 void DeletePeerConnection(); |
| 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 virtual void OnStateChange( | 67 |
| 68 webrtc::PeerConnectionObserver::StateType state_changed) {} | 68 void OnSignalingChange( |
| 69 virtual void OnAddStream(webrtc::MediaStreamInterface* stream); | 69 webrtc::PeerConnectionInterface::SignalingState new_state) override{}; |
| 70 virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream); | 70 void OnAddStream(webrtc::MediaStreamInterface* stream) override; |
| 71 virtual void OnDataChannel(webrtc::DataChannelInterface* channel) {} | 71 void OnRemoveStream(webrtc::MediaStreamInterface* stream) override; |
| 72 virtual void OnRenegotiationNeeded() {} | 72 void OnDataChannel(webrtc::DataChannelInterface* channel) override {} |
| 73 virtual void OnIceChange() {} | 73 void OnRenegotiationNeeded() override {} |
| 74 virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate); | 74 void OnIceConnectionChange( |
| 75 webrtc::PeerConnectionInterface::IceConnectionState new_state) override{}; |
| 76 void OnIceGatheringChange( |
| 77 webrtc::PeerConnectionInterface::IceGatheringState new_state) override{}; |
| 78 void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override; |
| 79 void OnIceConnectionReceivingChange(bool receiving) override {} |
| 75 | 80 |
| 76 // | 81 // |
| 77 // PeerConnectionClientObserver implementation. | 82 // PeerConnectionClientObserver implementation. |
| 78 // | 83 // |
| 79 | 84 |
| 80 virtual void OnSignedIn(); | 85 virtual void OnSignedIn(); |
| 81 | 86 |
| 82 virtual void OnDisconnected(); | 87 virtual void OnDisconnected(); |
| 83 | 88 |
| 84 virtual void OnPeerConnected(int id, const std::string& name); | 89 virtual void OnPeerConnected(int id, const std::string& name); |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 peer_connection_factory_; | 125 peer_connection_factory_; |
| 121 PeerConnectionClient* client_; | 126 PeerConnectionClient* client_; |
| 122 MainWindow* main_wnd_; | 127 MainWindow* main_wnd_; |
| 123 std::deque<std::string*> pending_messages_; | 128 std::deque<std::string*> pending_messages_; |
| 124 std::map<std::string, rtc::scoped_refptr<webrtc::MediaStreamInterface> > | 129 std::map<std::string, rtc::scoped_refptr<webrtc::MediaStreamInterface> > |
| 125 active_streams_; | 130 active_streams_; |
| 126 std::string server_; | 131 std::string server_; |
| 127 }; | 132 }; |
| 128 | 133 |
| 129 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ | 134 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ |
| OLD | NEW |