Base: Move WebSocketServer to its own directory

Just helps with organization

CMakeLists.txt

@@ -85,10 +85,10 @@ configure_file(
 set(obs-websocket_SOURCES
 	src/obs-websocket.cpp
 	src/Config.cpp
-	src/WebSocketServer.cpp
-	src/WebSocketServer_Protocol.cpp
-	src/WebSocketServer_RequestBatchProcessing.cpp
-	src/WebSocketSession.cpp
+	src/websocketserver/WebSocketServer.cpp
+	src/websocketserver/WebSocketServer_Protocol.cpp
+	src/websocketserver/WebSocketServer_RequestBatchProcessing.cpp
+	src/websocketserver/rpc/WebSocketSession.cpp
 	src/eventhandler/EventHandler.cpp
 	src/eventhandler/EventHandler_General.cpp
 	src/eventhandler/EventHandler_Config.cpp
@@ -124,8 +124,8 @@ set(obs-websocket_SOURCES
 set(obs-websocket_HEADERS
 	src/obs-websocket.h
 	src/Config.h
-	src/WebSocketServer.h
-	src/WebSocketSession.h
+	src/websocketserver/WebSocketServer.h
+	src/websocketserver/rpc/WebSocketSession.h
 	src/eventhandler/EventHandler.h
 	src/eventhandler/types/EventSubscription.h
 	src/requesthandler/RequestHandler.h

src/forms/SettingsDialog.cpp

@@ -7,7 +7,7 @@
 #include "SettingsDialog.h"
 #include "../obs-websocket.h"
 #include "../Config.h"
-#include "../WebSocketServer.h"
+#include "../websocketserver/WebSocketServer.h"
 #include "../utils/Crypto.h"
 
 QString GetToolTipIconHtml()

src/obs-websocket.cpp

@@ -7,7 +7,7 @@
 
 #include "obs-websocket.h"
 #include "Config.h"
-#include "WebSocketServer.h"
+#include "websocketserver/WebSocketServer.h"
 #include "eventhandler/EventHandler.h"
 #include "forms/SettingsDialog.h"
 

src/requesthandler/RequestHandler.h

@@ -7,7 +7,7 @@
 #include "rpc/RequestStatus.h"
 #include "rpc/Request.h"
 #include "rpc/RequestResult.h"
-#include "../WebSocketSession.h"
+#include "../websocketserver/rpc/WebSocketSession.h"
 #include "../obs-websocket.h"
 #include "../utils/Obs.h"
 #include "../plugin-macros.generated.h"

src/requesthandler/RequestHandler_General.cpp

@@ -1,7 +1,7 @@
 #include <QImageWriter>
 
 #include "RequestHandler.h"
-#include "../WebSocketServer.h"
+#include "../websocketserver/WebSocketServer.h"
 #include "../eventhandler/types/EventSubscription.h"
 #include "../obs-websocket.h"
 

src/websocketserver/WebSocketServer.cpp

@@ -5,12 +5,12 @@
 #include <obs-frontend-api.h>
 
 #include "WebSocketServer.h"
-#include "eventhandler/EventHandler.h"
-#include "obs-websocket.h"
-#include "Config.h"
-#include "utils/Crypto.h"
-#include "utils/Platform.h"
-#include "utils/Compat.h"
+#include "../eventhandler/EventHandler.h"
+#include "../obs-websocket.h"
+#include "../Config.h"
+#include "../utils/Crypto.h"
+#include "../utils/Platform.h"
+#include "../utils/Compat.h"
 
 WebSocketServer::WebSocketServer() :
 	QObject(nullptr),

src/websocketserver/WebSocketServer.h

@@ -7,10 +7,10 @@
 #include <websocketpp/config/asio_no_tls.hpp>
 #include <websocketpp/server.hpp>
 
-#include "utils/Json.h"
-#include "WebSocketSession.h"
-#include "requesthandler/rpc/Request.h"
-#include "plugin-macros.generated.h"
+#include "rpc/WebSocketSession.h"
+#include "../utils/Json.h"
+#include "../requesthandler/rpc/Request.h"
+#include "../plugin-macros.generated.h"
 
 class WebSocketServer : QObject
 {

src/websocketserver/WebSocketServer_Protocol.cpp

@@ -1,13 +1,13 @@
 #include <obs-module.h>
 
 #include "WebSocketServer.h"
-#include "requesthandler/RequestHandler.h"
-#include "eventhandler/EventHandler.h"
-#include "obs-websocket.h"
-#include "Config.h"
-#include "utils/Crypto.h"
-#include "utils/Platform.h"
-#include "utils/Compat.h"
+#include "../requesthandler/RequestHandler.h"
+#include "../eventhandler/EventHandler.h"
+#include "../obs-websocket.h"
+#include "../Config.h"
+#include "../utils/Crypto.h"
+#include "../utils/Platform.h"
+#include "../utils/Compat.h"
 
 namespace WebSocketOpCode {
 	enum WebSocketOpCode: uint8_t {

src/websocketserver/WebSocketServer_RequestBatchProcessing.cpp

@@ -1,9 +1,9 @@
 #include <util/profiler.h>
 
 #include "WebSocketServer.h"
-#include "requesthandler/RequestHandler.h"
-#include "obs-websocket.h"
-#include "utils/Compat.h"
+#include "../requesthandler/RequestHandler.h"
+#include "../obs-websocket.h"
+#include "../utils/Compat.h"
 
 struct SerialFrameRequest
 {

src/websocketserver/rpc/WebSocketSession.cpp

@@ -1,5 +1,5 @@
 #include "WebSocketSession.h"
-#include "eventhandler/types/EventSubscription.h"
+#include "../../eventhandler/types/EventSubscription.h"
 
 WebSocketSession::WebSocketSession() :
 	_remoteAddress(""),

src/websocketserver/rpc/WebSocketSession.h

@@ -5,7 +5,7 @@
 #include <atomic>
 #include <memory>
 
-#include "plugin-macros.generated.h"
+#include "../../plugin-macros.generated.h"
 
 class WebSocketSession;
 typedef std::shared_ptr<WebSocketSession> SessionPtr;