base: Update version to 5.2.3

Fixes #1136

.gitignore

@@ -2,7 +2,6 @@
 .DS_Store
 .idea
 .vscode
-**.generated.h
 /build/
 /build32/
 /build64/
@@ -10,5 +9,4 @@
 /package/
 /installer/Output/
 /docs/node_modules/
-/installer/installer-windows.generated.iss
 /cmake-build-debug/

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16...3.25)
 
 legacy_check()
 
-set(obs-websocket_VERSION 5.2.0)
+set(obs-websocket_VERSION 5.2.3)
 set(OBS_WEBSOCKET_RPC_VERSION 1)
 
 option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)
@@ -127,8 +127,8 @@ target_sources(
 
 target_sources(obs-websocket PRIVATE deps/qr/cpp/QrCode.cpp deps/qr/cpp/QrCode.hpp)
 
-configure_file(src/plugin-macros.h.in src/plugin-macros.generated.h)
-target_sources(obs-websocket PRIVATE src/plugin-macros.generated.h)
+configure_file(src/plugin-macros.h.in plugin-macros.generated.h)
+target_sources(obs-websocket PRIVATE plugin-macros.generated.h)
 
 target_compile_definitions(
   obs-websocket PRIVATE ASIO_STANDALONE $<$<BOOL:PLUGIN_TESTS>:PLUGIN_TESTS>
@@ -142,11 +142,9 @@ target_compile_options(
     $<$<PLATFORM_ID:Darwin,Linux,FreeBSD>:-Wall>
     $<$<COMPILE_LANG_AND_ID:CXX,GNU,AppleClang,Clang>:-Wno-error=float-conversion;-Wno-error=shadow>
     $<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-error=format-overflow;-Wno-error=int-conversion;-Wno-error=comment>
-    $<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=null-pointer-subtraction;-Wno-error=deprecated-declarations;-Wno-error=implicit-int-conversion;-Wno-error=shorten-64-to-32>
+    $<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=null-pointer-subtraction;-Wno-error=deprecated-declarations;-Wno-error=implicit-int-conversion;-Wno-error=shorten-64-to-32;-Wno-comma;-Wno-quoted-include-in-framework-header>
 )
 
-target_include_directories(obs-websocket PRIVATE deps/asio/asio/include deps/websocketpp)
-
 target_link_libraries(
   obs-websocket
   PRIVATE OBS::libobs

README.md

@@ -31,7 +31,7 @@ It is **highly recommended** to keep obs-websocket protected with a password aga
 
 ### Client software
 
-- [Macro Deck](https://www.macrodeck.org/)
+- [Macro Deck](https://macrodeck.org/)
 - [Touch Portal](https://www.touch-portal.com/)
 - [Twitchat](https://twitchat.fr/)
 - [OBS-web](https://github.com/Niek/obs-web) - hosted client at [obs-web.niek.tv/](http://obs-web.niek.tv/)

cmake/legacy.cmake

@@ -1,4 +1,4 @@
-project(obs-websocket VERSION 5.2.0)
+project(obs-websocket VERSION 5.2.3)
 set(OBS_WEBSOCKET_RPC_VERSION 1)
 
 option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)
@@ -32,8 +32,7 @@ find_package(Asio 1.12.1 REQUIRED)
 add_definitions(-DASIO_STANDALONE)
 
 # Configure files
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/plugin-macros.h.in
-               ${CMAKE_CURRENT_SOURCE_DIR}/src/plugin-macros.generated.h)
+configure_file(src/plugin-macros.h.in plugin-macros.generated.h)
 
 # Setup target
 add_library(obs-websocket MODULE)
@@ -49,6 +48,8 @@ if(_QT_VERSION EQUAL 6 AND OS_WINDOWS)
   set_target_properties(obs-websocket PROPERTIES AUTORCC_OPTIONS "--format-version;1")
 endif()
 
+target_include_directories(obs-websocket PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+
 target_sources(
   obs-websocket
   PRIVATE src/obs-websocket.cpp

data/locale/ca-ES.ini

@@ -1,10 +1,10 @@
-OBSWebSocket.Plugin.Description="Control remot de l'OBS Studio mitjançant un servidor web"
+OBSWebSocket.Plugin.Description="Control remot de l'OBS Studio mitjançant WebSocket"
 OBSWebSocket.Settings.DialogTitle="Configuració del servidor WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Configuració del complement"
-OBSWebSocket.Settings.ServerEnable="Habilita el servidor web"
+OBSWebSocket.Settings.ServerEnable="Habilita el servidor WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Habilita les notificacions a la barra de tasques"
 OBSWebSocket.Settings.DebugEnable="Habilita l'informe de depuració"
-OBSWebSocket.Settings.DebugEnableHoverText="Habilita l'informe de depuració només per a la instància actual de l'OBS i no queda resident en inicis posteriors.\nUtilitzeu --websocket_debug si us cal que el canvi sigui persistent."
+OBSWebSocket.Settings.DebugEnableHoverText="Habilita l'informe de depuració només per a la instància actual de l'OBS. No persisteix en inicis posteriors.\nUtilitzeu --websocket_debug si us cal que el canvi sigui persistent."
 OBSWebSocket.Settings.ServerSettingsTitle="Configuració del servidor"
 OBSWebSocket.Settings.AuthRequired="Habilita l'autenticació"
 OBSWebSocket.Settings.Password="Contrasenya del servidor"
@@ -15,29 +15,29 @@ OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Atenció: Actualment en direc
 OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Sembla que una sortida (retransmissió, gravació, etc.) està actualment activa."
 OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Segur que voleu mostrar la vostra informació de connexió?"
 OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Atenció: Risc potencial de seguretat"
-OBSWebSocket.Settings.Save.UserPasswordWarningMessage="El servidor web del l'OBS (obs-websocket) emmagatzema la contrasenya del servidor com a text pla. És altament recomanable l'ús d'una contrasenya generada automàticament."
+OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket emmagatzema la contrasenya del servidor com a text pla. És altament recomanable l'ús d'una contrasenya generada automàticament."
 OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Segur que voleu utilitzar la vostra contrasenya?"
 OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Error: Configuració no vàlida"
 OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Utilitzeu una contrasenya de 6 o més caràcters."
-OBSWebSocket.SessionTable.Title="Sessions de servidor connectades"
+OBSWebSocket.SessionTable.Title="Sessions de WebSocket connectades"
 OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Adreça remota"
 OBSWebSocket.SessionTable.SessionDurationColumnTitle="Durada de la sessió"
 OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Missatges d'entrada/sortida"
 OBSWebSocket.SessionTable.IdentifiedTitle="Identificat"
-OBSWebSocket.SessionTable.KickButtonColumnTitle="Expulsió?"
+OBSWebSocket.SessionTable.KickButtonColumnTitle="Expulsar?"
 OBSWebSocket.SessionTable.KickButtonText="Expulsa"
-OBSWebSocket.ConnectInfo.DialogTitle="Informació de connexió del servidor Web (WebSocket)"
+OBSWebSocket.ConnectInfo.DialogTitle="Informació de connexió del servidor WebSocket"
 OBSWebSocket.ConnectInfo.CopyText="Copia"
 OBSWebSocket.ConnectInfo.ServerIp="Adreça IP (més acurada)"
 OBSWebSocket.ConnectInfo.ServerPort="Port"
 OBSWebSocket.ConnectInfo.ServerPassword="Contrasenya"
 OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Autenticació inhabilitada]"
 OBSWebSocket.ConnectInfo.QrTitle="QR de la connexió"
-OBSWebSocket.TrayNotification.Identified.Title="Connexió nova de servidor Web (WebSocket)"
+OBSWebSocket.TrayNotification.Identified.Title="Connexió nova de WebSocket"
 OBSWebSocket.TrayNotification.Identified.Body="Client %1 identificat."
-OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Ha fallat l'autenticació del servidor Web"
+OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Ha fallat l'autenticació del servidor WebSocket"
 OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Ha fallat l'autenticació del client %1."
-OBSWebSocket.TrayNotification.Disconnected.Title="Client desconnectat del servidor Web"
+OBSWebSocket.TrayNotification.Disconnected.Title="Client desconnectat del servidor WebSocket"
 OBSWebSocket.TrayNotification.Disconnected.Body="Client %1 desconnectat."
-OBSWebSocket.Server.StartFailed.Title="Ha fallat el servidor Web (WebSocket)"
-OBSWebSocket.Server.StartFailed.Message="El servidor Web ha fallat en iniciar. Potser el port TCP %1 ja està en ús per altre programa del sistema. Proveu un port diferent a la configuració del servidor Web (WebSocket), o atureu qualsevol altra aplicació que pugui utilitzar aquest port.\n Missatge d'error: %2"
+OBSWebSocket.Server.StartFailed.Title="Ha fallat el servidor WebSocket"
+OBSWebSocket.Server.StartFailed.Message="El servidor WebSocket ha fallat en iniciar. Potser el port TCP %1 ja està en ús per altre programa del sistema. Proveu un port diferent a la configuració del servidor WebSocket, o atureu qualsevol altra aplicació que pugui utilitzar aquest port.\n Missatge d'error: %2"

data/locale/fa-IR.ini

@@ -1,4 +1,5 @@
 OBSWebSocket.Plugin.Description="کنترل از راه دور OBS Studio از طریق WebSocket"
+OBSWebSocket.Settings.DialogTitle="تنظیمات سرور سوکت وب"
 OBSWebSocket.Settings.PluginSettingsTitle="تنظیمات پلاگین"
 OBSWebSocket.Settings.ServerEnable="سرور سوکت وب را فعال کنید"
 OBSWebSocket.Settings.AlertsEnable="هشدارهای سینی سیستم را فعال کنید"

data/locale/hy-AM.ini

@@ -1,4 +1,5 @@
 OBSWebSocket.Plugin.Description="OBS Studio-ի հեռակառավարումը WebSocket-ի միջոցով"
+OBSWebSocket.Settings.DialogTitle="WebSocket Սպասարկչի Կարգավորումները"
 OBSWebSocket.Settings.PluginSettingsTitle="Միացնիչի կարգավորումներ"
 OBSWebSocket.Settings.ServerEnable="Միացնել WebSocket սերվերը"
 OBSWebSocket.Settings.AlertsEnable="Միացնել սկուտեղի ծանուցումները"

data/locale/nb-NO.ini

@@ -0,0 +1,2 @@
+OBSWebSocket.Settings.Password="Server Passord"
+OBSWebSocket.Settings.GeneratePassword="Generer Passord"

data/locale/pt-PT.ini

@@ -1,4 +1,5 @@
 OBSWebSocket.Plugin.Description="Controlo remoto do OBS Studio através de WebSocket"
+OBSWebSocket.Settings.DialogTitle="Definições do servidor WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Configurações do plugin"
 OBSWebSocket.Settings.ServerEnable="Ativar servidor WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Ativar alertas da bandeja do sistema"

data/locale/vi-VN.ini

@@ -1,7 +1,39 @@
+OBSWebSocket.Plugin.Description="Điều khiển từ xa OBS Studio thông qua WebSocket"
+OBSWebSocket.Settings.DialogTitle="Cài đặt máy chủ WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Thiết đặt trình cắm"
 OBSWebSocket.Settings.ServerEnable="Bật máy chủ WebSocket"
+OBSWebSocket.Settings.AlertsEnable="Bật cảnh báo khay hệ thống"
+OBSWebSocket.Settings.DebugEnable="Bật ghi nhật ký gỡ lỗi"
+OBSWebSocket.Settings.DebugEnableHoverText="Cho phép ghi nhật ký gỡ lỗi cho phiên bản OBS hiện tại. Không tồn tại khi tải.\nUde --websocket gỡ lỗi để bật khi tải."
 OBSWebSocket.Settings.ServerSettingsTitle="Thiết đặt máy chủ"
+OBSWebSocket.Settings.AuthRequired="Bật xác thực"
 OBSWebSocket.Settings.Password="Mật khẩu máy chủ"
 OBSWebSocket.Settings.GeneratePassword="Tạo mật khẩu"
 OBSWebSocket.Settings.ServerPort="Cổng máy chủ"
 OBSWebSocket.Settings.ShowConnectInfo="Hiện thông tin kết nối"
+OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Cảnh báo: Hiện đang chạy"
+OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Có vẻ như một đầu ra (luồng, bản ghi, v.v.) hiện đang hoạt động."
+OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Bạn có chắc chắn muốn hiển thị thông tin kết nối của mình không?"
+OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Cảnh báo: Vấn đề bảo mật tiềm ẩn"
+OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket lưu trữ mật khẩu máy chủ dưới dạng văn bản thuần túy. Bạn nên sử dụng mật khẩu được tạo bởi obs-websocket."
+OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Bạn có chắc bạn muốn sử dụng mật khẩu của mình?"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Lỗi: Thiết lập không hợp lệ"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Bạn phải sử dụng mật khẩu có 6 ký tự trở lên."
+OBSWebSocket.SessionTable.Title="Các phiên WebSocket được kết nối"
+OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Địa chỉ từ xa"
+OBSWebSocket.SessionTable.SessionDurationColumnTitle="Thời lượng phiên"
+OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Tin nhắn vào/ra"
+OBSWebSocket.SessionTable.IdentifiedTitle="Định dạng"
+OBSWebSocket.ConnectInfo.DialogTitle="Thông tin kết nối WebSocket"
+OBSWebSocket.ConnectInfo.ServerIp="IP Máy chủ (Gợi ý tốt nhất)"
+OBSWebSocket.ConnectInfo.ServerPort="Cổng máy chủ"
+OBSWebSocket.ConnectInfo.ServerPassword="Mật khẩu máy chủ"
+OBSWebSocket.ConnectInfo.QrTitle="Kết nối bằng mã QR"
+OBSWebSocket.TrayNotification.Identified.Title="Tạo cổng kết nối WebSocket mới"
+OBSWebSocket.TrayNotification.Identified.Body="Máy khách %1 được xác định."
+OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Lỗi xác thực WebSocket"
+OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Máy khách %1 không xác thực được."
+OBSWebSocket.TrayNotification.Disconnected.Title="Máy khách WebSocket bị ngắt kết nối"
+OBSWebSocket.TrayNotification.Disconnected.Body="Máy khách %1 bị ngắt kết nối."
+OBSWebSocket.Server.StartFailed.Title="Lỗi máy chủ WebSocket"
+OBSWebSocket.Server.StartFailed.Message="Máy chủ WebSocket không khởi động được. Cổng TCP %1 có thể đã được ứng dụng khác sử dụng ở nơi khác trên hệ thống này. Hãy thử đặt một cổng TCP khác trong cài đặt máy chủ WebSocket hoặc dừng bất kỳ ứng dụng nào có thể đang sử dụng cổng này.\n Thông báo lỗi: %2"

data/locale/zh-CN.ini

@@ -4,7 +4,7 @@ OBSWebSocket.Settings.PluginSettingsTitle="插件设置"
 OBSWebSocket.Settings.ServerEnable="开启 WebSocket 服务器"
 OBSWebSocket.Settings.AlertsEnable="开启系统托盘提醒"
 OBSWebSocket.Settings.DebugEnable="开启调试日志"
-OBSWebSocket.Settings.DebugEnableHoverText="启用当前 OBS 实例的调试日志。下次启动时需重新设置。\n使用 --websocket_debug 在启动 OBS 时启用日志。"
+OBSWebSocket.Settings.DebugEnableHoverText="开启当前 OBS 实例的调试日志。下次启动时需重新设置。\n使用 --websocket_debug 在启动 OBS 时开启日志。"
 OBSWebSocket.Settings.ServerSettingsTitle="服务器设置"
 OBSWebSocket.Settings.AuthRequired="开启鉴权"
 OBSWebSocket.Settings.Password="服务器密码"

docs/generated/protocol.json

@@ -237,6 +237,14 @@
           "initialVersion": "5.0.0",
           "enumValue": 206
         },
+        {
+          "description": "The server is not ready to handle the request.\n\nNote: This usually occurs during OBS scene collection change or exit. Requests may be tried again after a delay if this code is given.",
+          "enumIdentifier": "NotReady",
+          "rpcVersion": "1",
+          "deprecated": false,
+          "initialVersion": "5.3.0",
+          "enumValue": 207
+        },
         {
           "description": "A required request field is missing.",
           "enumIdentifier": "MissingRequestField",

docs/generated/protocol.md

@@ -471,6 +471,7 @@ These are enumeration declarations, which are referenced throughout obs-websocke
   - [RequestStatus::UnknownRequestType](#requeststatusunknownrequesttype)
   - [RequestStatus::GenericError](#requeststatusgenericerror)
   - [RequestStatus::UnsupportedRequestBatchExecutionType](#requeststatusunsupportedrequestbatchexecutiontype)
+  - [RequestStatus::NotReady](#requeststatusnotready)
   - [RequestStatus::MissingRequestField](#requeststatusmissingrequestfield)
   - [RequestStatus::MissingRequestData](#requeststatusmissingrequestdata)
   - [RequestStatus::InvalidRequestField](#requeststatusinvalidrequestfield)
@@ -879,6 +880,18 @@ The request batch execution type is not supported.
 
 ---
 
+### RequestStatus::NotReady
+
+The server is not ready to handle the request.
+
+Note: This usually occurs during OBS scene collection change or exit. Requests may be tried again after a delay if this code is given.
+
+- Identifier Value: `207`
+- Latest Supported RPC Version: `1`
+- Added in v5.3.0
+
+---
+
 ### RequestStatus::MissingRequestField
 
 A required request field is missing.

src/eventhandler/EventHandler.cpp

@@ -269,7 +269,7 @@ void EventHandler::OnFrontendEvent(enum obs_frontend_event event, void *private_
 	case OBS_FRONTEND_EVENT_FINISHED_LOADING:
 		eventHandler->FrontendFinishedLoadingMultiHandler();
 		break;
-	case OBS_FRONTEND_EVENT_EXIT:
+	case OBS_FRONTEND_EVENT_SCRIPTING_SHUTDOWN:
 		eventHandler->FrontendExitMultiHandler();
 		break;
 

src/eventhandler/EventHandler.h

@@ -27,7 +27,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "../obs-websocket.h"
 #include "../utils/Obs.h"
 #include "../utils/Obs_VolumeMeter.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 class EventHandler {
 public:

src/eventhandler/EventHandler_Scenes.cpp

@@ -103,7 +103,10 @@ void EventHandler::HandleCurrentProgramSceneChanged()
 	OBSSourceAutoRelease currentScene = obs_frontend_get_current_scene();
 
 	json eventData;
-	eventData["sceneName"] = obs_source_get_name(currentScene);
+	if (currentScene)
+		eventData["sceneName"] = obs_source_get_name(currentScene);
+	else
+		eventData["sceneName"] = nullptr;
 	BroadcastEvent(EventSubscription::Scenes, "CurrentProgramSceneChanged", eventData);
 }
 

src/forms/ConnectInfo.h

@@ -21,7 +21,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <QtWidgets/QDialog>
 
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 #include "ui_ConnectInfo.h"
 

src/forms/SettingsDialog.h

@@ -23,7 +23,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <QTimer>
 
 #include "ConnectInfo.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 #include "ui_SettingsDialog.h"
 

src/requesthandler/RequestHandler.h

@@ -30,7 +30,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "../websocketserver/rpc/WebSocketSession.h"
 #include "../obs-websocket.h"
 #include "../utils/Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 class RequestHandler;
 typedef RequestResult (RequestHandler::*RequestMethodHandler)(const Request &);

src/requesthandler/types/RequestStatus.h

@@ -103,6 +103,19 @@ namespace RequestStatus {
 		* @api enums
 		*/
 		UnsupportedRequestBatchExecutionType = 206,
+		/**
+		* The server is not ready to handle the request.
+		*
+		* Note: This usually occurs during OBS scene collection change or exit. Requests may be tried again after a delay if this code is given.
+		*
+		* @enumIdentifier NotReady
+		* @enumValue 207
+		* @enumType RequestStatus
+		* @rpcVersion -1
+		* @initialVersion 5.3.0
+		* @api enums
+		*/
+		NotReady = 207,
 
 		/**
 		* A required request field is missing.

src/utils/Crypto.cpp

@@ -22,7 +22,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <QRandomGenerator>
 
 #include "Crypto.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 static const char allowedChars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 static const int allowedCharsCount = static_cast<int>(sizeof(allowedChars) - 1);

src/utils/Json.cpp

@@ -19,7 +19,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include "Json.h"
 #include "Platform.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 bool Utils::Json::JsonArrayIsValidObsArray(const json &j)
 {

src/utils/Obs.cpp

@@ -18,4 +18,4 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"

src/utils/Obs_ActionHelper.cpp

@@ -17,7 +17,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 struct CreateSceneItemData {
 	obs_source_t *source;                             // In

src/utils/Obs_ArrayHelper.cpp

@@ -20,7 +20,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <algorithm>
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 static std::vector<std::string> ConvertStringArray(char **array)
 {

src/utils/Obs_NumberHelper.cpp

@@ -21,7 +21,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <util/util_uint64.h>
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 uint64_t Utils::Obs::NumberHelper::GetOutputDuration(obs_output_t *output)
 {

src/utils/Obs_ObjectHelper.cpp

@@ -21,7 +21,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include "Obs.h"
 #include "../obs-websocket.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 json Utils::Obs::ObjectHelper::GetStats()
 {

src/utils/Obs_SearchHelper.cpp

@@ -17,7 +17,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 obs_hotkey_t *Utils::Obs::SearchHelper::GetHotkeyByName(std::string name)
 {

src/utils/Obs_StringHelper.cpp

@@ -21,7 +21,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <QString>
 
 #include "Obs.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 #define CASE(x) \
 	case x: \

src/utils/Platform.cpp

@@ -25,7 +25,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <obs-frontend-api.h>
 
 #include "Platform.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 std::string Utils::Platform::GetLocalAddress()
 {

src/websocketserver/WebSocketServer.h

@@ -32,7 +32,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "types/WebSocketOpCode.h"
 #include "../utils/Json.h"
 #include "../requesthandler/rpc/Request.h"
-#include "../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 class WebSocketServer : QObject {
 	Q_OBJECT

src/websocketserver/rpc/WebSocketSession.h

@@ -24,7 +24,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <atomic>
 #include <memory>
 
-#include "../../plugin-macros.generated.h"
+#include "plugin-macros.generated.h"
 
 class WebSocketSession;
 typedef std::shared_ptr<WebSocketSession> SessionPtr;