Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Server: QThread wasn't actually used...

Browse Source
This commit is contained in:
Stéphane L 2017-09-08 00:01:26 +02:00
parent 4404889019
commit 3b0cf02574
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
WSServer.cpp
View File

@ -30,22 +30,18 @@ QT_USE_NAMESPACE
WSServer* WSServer::Instance = nullptr; WSServer* WSServer::Instance = nullptr;
WSServer::WSServer(QObject* parent) : WSServer::WSServer(QObject* parent)
QObject(parent), : QObject(parent),
_wsServer(Q_NULLPTR), _wsServer(Q_NULLPTR),
_clients(), _clients(),
_clMutex(QMutex::Recursive) { _clMutex(QMutex::Recursive) {
_serverThread = new QThread();
_wsServer = new QWebSocketServer( _wsServer = new QWebSocketServer(
QStringLiteral("obs-websocket"), QStringLiteral("obs-websocket"),
QWebSocketServer::NonSecureMode, QWebSocketServer::NonSecureMode);
_serverThread);
_serverThread->start();
} }
WSServer::~WSServer() { WSServer::~WSServer() {
Stop(); Stop();
delete _serverThread;
} }
void WSServer::Start(quint16 port) { void WSServer::Start(quint16 port) {

1
WSServer.h
View File

@ -47,7 +47,6 @@ class WSServer : public QObject {
QWebSocketServer* _wsServer; QWebSocketServer* _wsServer;
QList<QWebSocket*> _clients; QList<QWebSocket*> _clients;
QMutex _clMutex; QMutex _clMutex;
QThread* _serverThread;
}; };
#endif // WSSERVER_H #endif // WSSERVER_H