Index: webrtc/base/signalthread.h |
diff --git a/webrtc/base/signalthread.h b/webrtc/base/signalthread.h |
index ec250c6aad3063126f15de120786e9b90475b255..93247ebb00ed2937d0d0dbb90d5bef2cb225bf39 100644 |
--- a/webrtc/base/signalthread.h |
+++ b/webrtc/base/signalthread.h |
@@ -14,6 +14,7 @@ |
#include <string> |
#include "webrtc/base/constructormagic.h" |
+#include "webrtc/base/nullsocketserver.h" |
#include "webrtc/base/sigslot.h" |
#include "webrtc/base/thread.h" |
@@ -40,7 +41,7 @@ class SignalThread |
: public sigslot::has_slots<>, |
protected MessageHandler { |
public: |
- SignalThread(); |
+ explicit SignalThread(bool useSocketServer = true); |
tommi
2016/07/25 06:20:22
use_socket_server
(also update elsewhere)
magjed_webrtc
2016/07/25 13:33:04
Done (too much Java code).
|
// Context: Main Thread. Call before Start to change the worker's name. |
bool SetName(const std::string& name, const void* obj); |
@@ -102,7 +103,11 @@ class SignalThread |
class Worker : public Thread { |
public: |
- explicit Worker(SignalThread* parent) : parent_(parent) {} |
+ explicit Worker(SignalThread* parent, bool useSocketServer) |
+ : Thread(useSocketServer |
+ ? SocketServer::CreateDefault() |
+ : std::unique_ptr<SocketServer>(new NullSocketServer())), |
+ parent_(parent) {} |
~Worker() override; |
void Run() override; |