Merge pull request #1767 from ratwithashotgun/caption-pr1

deps/obs-scripting: Expose obs_output_output_caption_text1 to scripts

CI/before-script-osx.sh

@@ -12,4 +12,5 @@ cmake -DENABLE_SPARKLE_UPDATER=ON \
 -DVLCPath=$PWD/../../vlc-3.0.4 \
 -DBUILD_BROWSER=ON \
 -DBROWSER_DEPLOY=ON \
+-DBUILD_CAPTIONS=ON \
 -DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 ..

deps/obs-scripting/CMakeLists.txt

@@ -77,6 +77,10 @@ if(UI_ENABLED)
 	include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/UI/obs-frontend-api")
 endif()
 
+IF(BUILD_CAPTIONS)
+	string(TOUPPER "${BUILD_CAPTIONS}" BUILD_CAPTIONS)
+endif()
+
 configure_file(
 	"${CMAKE_CURRENT_SOURCE_DIR}/obs-scripting-config.h.in"
 	"${CMAKE_CURRENT_BINARY_DIR}/obs-scripting-config.h")

deps/obs-scripting/obs-scripting-config.h.in

@@ -21,3 +21,4 @@
 #define COMPILE_LUA    @LUAJIT_FOUND@
 #define COMPILE_PYTHON @PYTHON_FOUND@
 #define UI_ENABLED     @UI_ENABLED@
+#define BUILD_CAPTIONS @BUILD_CAPTIONS@

deps/obs-scripting/obslua/obslua.i

@@ -84,6 +84,7 @@ static inline void wrap_blog(int log_level, const char *message)
 %include "graphics/vec2.h"
 %include "graphics/quat.h"
 %include "graphics/image-file.h"
+%include "obs-scripting-config.h"
 %include "obs-data.h"
 %include "obs-source.h"
 %include "obs-properties.h"
@@ -95,7 +96,6 @@ static inline void wrap_blog(int log_level, const char *message)
 %include "callback/signal.h"
 %include "util/bmem.h"
 %include "util/base.h"
-%include "obs-scripting-config.h"
 
 #if UI_ENABLED
 %include "obs-frontend-api.h"

deps/obs-scripting/obspython/obspython.i

@@ -82,6 +82,7 @@ static inline void wrap_blog(int log_level, const char *message)
 %include "graphics/vec3.h"
 %include "graphics/vec2.h"
 %include "graphics/quat.h"
+%include "obs-scripting-config.h"
 %include "obs-data.h"
 %include "obs-source.h"
 %include "obs-properties.h"
@@ -93,7 +94,6 @@ static inline void wrap_blog(int log_level, const char *message)
 %include "callback/signal.h"
 %include "util/bmem.h"
 %include "util/base.h"
-%include "obs-scripting-config.h"
 
 #if UI_ENABLED
 %include "obs-frontend-api.h"