1berry/obs-studio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

obs-scripting: Fix compilation warnings on Clang and GCC

Browse Source 
- Fix Python deprecation warnings
- Fix maybe uninitialized warning (GCC only)
This commit is contained in:
tytan652 2022-08-03 08:53:29 +02:00 committed by Ryan Foster
parent 2839837ed6
commit c6a8b03719
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deps/obs-scripting/obs-scripting-python.c vendored
View File

@ -1538,7 +1538,7 @@ static void python_tick(void *param, float seconds)
* the cur_python_script state variable. Use the busy_script variable * the cur_python_script state variable. Use the busy_script variable
* to save and restore the value if not null. * to save and restore the value if not null.
*/ */
struct obs_python_script *busy_script; struct obs_python_script *busy_script = NULL;
bool valid; bool valid;
uint64_t ts = obs_get_video_frame_time(); uint64_t ts = obs_get_video_frame_time();
@ -1686,15 +1686,15 @@ bool obs_scripting_load_python(const char *python_path)
#if RUNTIME_LINK #if RUNTIME_LINK
if (python_version.major == 3 && python_version.minor < 7) { if (python_version.major == 3 && python_version.minor < 7) {
#elif PY_VERSION_HEX < 0x030700b0
if (true) {
#else
if (false) {
#endif
PyEval_InitThreads(); PyEval_InitThreads();
if (!PyEval_ThreadsInitialized()) if (!PyEval_ThreadsInitialized())
return false; return false;
} }
#elif PY_VERSION_HEX < 0x03070000
PyEval_InitThreads();
if (!PyEval_ThreadsInitialized())
return false;
#endif
/* ---------------------------------------------- */ /* ---------------------------------------------- */
/* Must set arguments for guis to work */ /* Must set arguments for guis to work */