lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 26.0.0+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2020-10-01 22:15:25 +02:00
parent 8e020cdacb
commit 240080891f
837 changed files with 41275 additions and 9196 deletions
Download patch file Download diff file Expand all files Collapse all files

2
deps/obs-scripting/CMakeLists.txt vendored
View file

@ -207,6 +207,8 @@ target_link_libraries(obs-scripting
${obs-scripting_PLATFORM_DEPS}
)
set_target_properties(obs-scripting PROPERTIES FOLDER "scripting")
if(PYTHONLIBS_FOUND)
add_subdirectory(obspython)
endif()

9
deps/obs-scripting/obs-scripting-python.c vendored
View file

@ -147,8 +147,13 @@ void add_functions_to_py_module(PyObject *module, PyMethodDef *method_list)
static PyObject *py_get_current_script_path(PyObject *self, PyObject *args)
{
PyObject *dir;
UNUSED_PARAMETER(args);
return PyDict_GetItemString(PyModule_GetDict(self), "__script_dir__");
dir = PyDict_GetItemString(PyModule_GetDict(self), "__script_dir__");
Py_XINCREF(dir);
return dir;
}
static void get_defaults(struct obs_python_script *data, PyObject *get_defs)
@ -595,7 +600,7 @@ static PyObject *obs_python_signal_handler_disconnect(PyObject *self,
const char *cb_signal =
calldata_string(&cb->base.extra, "signal");
if (cb_signal && strcmp(signal, cb_signal) != 0 &&
if (cb_signal && strcmp(signal, cb_signal) == 0 &&
handler == cb_handler)
break;

2
deps/obs-scripting/obslua/CMakeLists.txt vendored
View file

@ -35,6 +35,8 @@ else()
endif()
SWIG_LINK_LIBRARIES(obslua obs-scripting libobs ${LUA_LIBRARIES} ${EXTRA_LIBS})
set_target_properties(obslua PROPERTIES FOLDER "scripting")
function(install_plugin_bin_swig target additional_target)
if(APPLE)
set(_bit_suffix "")

2
deps/obs-scripting/obslua/obslua.i vendored
View file

@ -24,6 +24,7 @@
#include <util/base.h>
#include "cstrcache.h"
#include "obs-scripting-config.h"
#include <util/platform.h>
#if UI_ENABLED
#include "obs-frontend-api.h"
@ -100,6 +101,7 @@ static inline void wrap_blog(int log_level, const char *message)
%include "callback/signal.h"
%include "util/bmem.h"
%include "util/base.h"
%include "util/platform.h"
#if UI_ENABLED
%include "obs-frontend-api.h"

2
deps/obs-scripting/obspython/CMakeLists.txt vendored
View file

@ -54,6 +54,8 @@ ELSE()
SWIG_LINK_LIBRARIES(obspython obs-scripting libobs ${PYTHON_LIBRARIES})
ENDIF()
set_target_properties(_obspython PROPERTIES FOLDER "scripting")
function(install_plugin_bin_swig target additional_target)
if(APPLE)
set(_bit_suffix "")

2
deps/obs-scripting/obspython/obspython.i vendored
View file

@ -24,6 +24,7 @@
#include <util/bmem.h>
#include <util/base.h>
#include "obs-scripting-config.h"
#include <util/platform.h>
#if UI_ENABLED
#include "obs-frontend-api.h"
@ -98,6 +99,7 @@ static inline void wrap_blog(int log_level, const char *message)
%include "callback/signal.h"
%include "util/bmem.h"
%include "util/base.h"
%include "util/platform.h"
#if UI_ENABLED
%include "obs-frontend-api.h"