From a196fc7824a7b7e4bbf3f4f725a41a2a7787a6e6 Mon Sep 17 00:00:00 2001 From: tt2468 Date: Fri, 13 May 2022 20:40:34 -0700 Subject: [PATCH] plugins: Add obs-websocket submodule Adds obs-websocket as a submodule, to be included in future releases of OBS Studio by default. --- .gitmodules | 3 +++ CI/check-cmake.sh | 3 ++- CI/check-format.sh | 3 ++- plugins/CMakeLists.txt | 1 + plugins/obs-websocket | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) create mode 160000 plugins/obs-websocket diff --git a/.gitmodules b/.gitmodules index 18bee8413..11089575a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "plugins/obs-outputs/ftl-sdk"] path = plugins/obs-outputs/ftl-sdk url = https://github.com/Mixer/ftl-sdk.git +[submodule "plugins/obs-websocket"] + path = plugins/obs-websocket + url = https://github.com/obsproject/obs-websocket.git diff --git a/CI/check-cmake.sh b/CI/check-cmake.sh index 8879ea91e..0c7501a6e 100755 --- a/CI/check-cmake.sh +++ b/CI/check-cmake.sh @@ -44,7 +44,8 @@ find . -type d \( \ -path ./plugins/obs-outputs/ftl-sdk -o \ -path ./plugins/obs-vst -o \ -path ./plugins/obs-browser -o \ - -path ./plugins/win-dshow/libdshowcapture \ + -path ./plugins/win-dshow/libdshowcapture -o \ + -path ./plugins/obs-websocket/deps \ \) -prune -false -type f -o \ -name 'CMakeLists.txt' -or \ -name '*.cmake' \ diff --git a/CI/check-format.sh b/CI/check-format.sh index 9f0378102..0d940eb27 100755 --- a/CI/check-format.sh +++ b/CI/check-format.sh @@ -47,7 +47,8 @@ find . -type d \( \ -path ./plugins/decklink/\*/decklink-sdk -o \ -path ./plugins/enc-amf -o \ -path ./plugins/mac-syphon/syphon-framework -o \ - -path ./plugins/obs-outputs/ftl-sdk \ + -path ./plugins/obs-outputs/ftl-sdk -o \ + -path ./plugins/obs-websocket/deps \ \) -prune -false -type f -o \ -name '*.h' -or \ -name '*.hpp' -or \ diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index e23fc9d5c..d72b2229c 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -92,3 +92,4 @@ add_subdirectory(obs-transitions) add_subdirectory(rtmp-services) add_subdirectory(text-freetype2) add_subdirectory(aja) +add_subdirectory(obs-websocket) diff --git a/plugins/obs-websocket b/plugins/obs-websocket new file mode 160000 index 000000000..8bf8995ad --- /dev/null +++ b/plugins/obs-websocket @@ -0,0 +1 @@ +Subproject commit 8bf8995ad8274fd495b3d3db5fe2b8714339ae72