diff --git a/lib/utils/websocket-api.cpp b/lib/utils/websocket-api.cpp index 9ef4cace..19f512d2 100644 --- a/lib/utils/websocket-api.cpp +++ b/lib/utils/websocket-api.cpp @@ -9,11 +9,11 @@ namespace advss { static std::vector> callbacks; -constexpr char VendorName[] = "AdvancedSceneSwitcher"; -constexpr char VendorRequestStart[] = "AdvancedSceneSwitcherStart"; -constexpr char VendorRequestStop[] = "AdvancedSceneSwitcherStop"; -constexpr char VendorRequestStatus[] = "IsAdvancedSceneSwitcherRunning"; -obs_websocket_vendor vendor; +static constexpr char VendorName[] = "AdvancedSceneSwitcher"; +static constexpr char VendorRequestStart[] = "AdvancedSceneSwitcherStart"; +static constexpr char VendorRequestStop[] = "AdvancedSceneSwitcherStop"; +static constexpr char VendorRequestStatus[] = "IsAdvancedSceneSwitcherRunning"; +static obs_websocket_vendor vendor; static void registerWebsocketVendor(); diff --git a/plugins/base/utils/websocket-helpers.cpp b/plugins/base/utils/websocket-helpers.cpp index 62870aeb..ee844fb0 100644 --- a/plugins/base/utils/websocket-helpers.cpp +++ b/plugins/base/utils/websocket-helpers.cpp @@ -17,8 +17,8 @@ using websocketpp::lib::bind; #define RPC_VERSION 1 #undef DispatchMessage -constexpr char VendorRequestMessage[] = "AdvancedSceneSwitcherMessage"; -constexpr char VendorEventMessage[] = "AdvancedSceneSwitcherEvent"; +static constexpr char VendorRequestMessage[] = "AdvancedSceneSwitcherMessage"; +static constexpr char VendorEventMessage[] = "AdvancedSceneSwitcherEvent"; static WebsocketMessageDispatcher websocketMessageDispatcher; @@ -47,7 +47,8 @@ void SendWebsocketEvent(const std::string &eventMsg) static void receiveWebsocketMessage(obs_data_t *request_data, obs_data_t *) { if (!obs_data_has_user_value(request_data, "message")) { - vblog(LOG_INFO, "received unexpected m '%s'", + vblog(LOG_INFO, + "received unexpected AdvancedSceneSwitcherMessage: '%s'", obs_data_get_json(request_data)); return; }