| Index: webrtc/api/webrtcsession.h
|
| diff --git a/webrtc/api/webrtcsession.h b/webrtc/api/webrtcsession.h
|
| index 8a32d78f5eda19185d1851b497e0e8bffc3e774e..6eb499fa23be2004188419fe922a5a35138dbd5f 100644
|
| --- a/webrtc/api/webrtcsession.h
|
| +++ b/webrtc/api/webrtcsession.h
|
| @@ -138,14 +138,15 @@ class WebRtcSession : public AudioProviderInterface,
|
| };
|
|
|
| WebRtcSession(webrtc::MediaControllerInterface* media_controller,
|
| - rtc::Thread* signaling_thread,
|
| + rtc::Thread* network_thread,
|
| rtc::Thread* worker_thread,
|
| + rtc::Thread* signaling_thread,
|
| cricket::PortAllocator* port_allocator);
|
| virtual ~WebRtcSession();
|
|
|
| // These are const to allow them to be called from const methods.
|
| - rtc::Thread* signaling_thread() const { return signaling_thread_; }
|
| rtc::Thread* worker_thread() const { return worker_thread_; }
|
| + rtc::Thread* signaling_thread() const { return signaling_thread_; }
|
|
|
| // The ID of this session.
|
| const std::string& id() const { return sid_; }
|
| @@ -464,8 +465,8 @@ class WebRtcSession : public AudioProviderInterface,
|
|
|
| void OnSentPacket_w(const rtc::SentPacket& sent_packet);
|
|
|
| - rtc::Thread* const signaling_thread_;
|
| rtc::Thread* const worker_thread_;
|
| + rtc::Thread* const signaling_thread_;
|
|
|
| State state_ = STATE_INIT;
|
| Error error_ = ERROR_NONE;
|
|
|