From f0d68f3eecd42b636aaf2520d76ee2d74b26f1cf Mon Sep 17 00:00:00 2001 From: tt2468 Date: Thu, 13 May 2021 17:48:10 -0700 Subject: [PATCH] WebSocketProtocol: Remove `availableEvents` from `Hello` Not reasonably possible with the current structure of the `EventHandler` --- src/WebSocketProtocol.cpp | 7 ------- src/WebSocketProtocol.h | 1 - src/WebSocketServer.cpp | 1 - 3 files changed, 9 deletions(-) diff --git a/src/WebSocketProtocol.cpp b/src/WebSocketProtocol.cpp index 1a74ae1a..f89aed1f 100644 --- a/src/WebSocketProtocol.cpp +++ b/src/WebSocketProtocol.cpp @@ -242,10 +242,3 @@ std::vector WebSocketProtocol::GetRequestList() return requestHandler.GetRequestList(); } - -std::vector WebSocketProtocol::GetEventList() -{ - std::vector ret; - - return ret; -} diff --git a/src/WebSocketProtocol.h b/src/WebSocketProtocol.h index 2b57bc31..9a2e3e91 100644 --- a/src/WebSocketProtocol.h +++ b/src/WebSocketProtocol.h @@ -21,5 +21,4 @@ namespace WebSocketProtocol { ProcessResult ProcessMessage(SessionPtr session, json incomingMessage); std::vector GetRequestList(); - std::vector GetEventList(); } diff --git a/src/WebSocketServer.cpp b/src/WebSocketServer.cpp index 3c404799..892223db 100644 --- a/src/WebSocketServer.cpp +++ b/src/WebSocketServer.cpp @@ -273,7 +273,6 @@ void WebSocketServer::onOpen(websocketpp::connection_hdl hdl) helloMessage["obsWebSocketVersion"] = OBS_WEBSOCKET_VERSION; helloMessage["rpcVersion"] = OBS_WEBSOCKET_RPC_VERSION; helloMessage["availableRequests"] = WebSocketProtocol::GetRequestList(); - helloMessage["availableEvents"] = WebSocketProtocol::GetEventList(); if (AuthenticationRequired) { session->SetSecret(AuthenticationSecret); std::string sessionChallenge = Utils::Crypto::GenerateSalt();