4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

obs-frontend-api: Make a few frontend API thread-safe

Browse source 
Additionally, check for null output handlers.
This commit is contained in:
jp9000 2019-02-18 19:28:26 -08:00
commit d17ee20863
3 changed files with 43 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
UI/api-interface.cpp
View file

@ -232,7 +232,12 @@ struct OBSStudioAPI : obs_frontend_callbacks {
bool obs_frontend_streaming_active(void) override
{
return main->outputHandler->StreamingActive();
bool active;
QMetaObject::invokeMethod(main,
"StreamingActive",
WaitConnection(),
Q_RETURN_ARG(bool, active));
return active;
}
void obs_frontend_recording_start(void) override
@ -247,7 +252,12 @@ struct OBSStudioAPI : obs_frontend_callbacks {
bool obs_frontend_recording_active(void) override
{
return main->outputHandler->RecordingActive();
bool active;
QMetaObject::invokeMethod(main,
"RecordingActive",
WaitConnection(),
Q_RETURN_ARG(bool, active));
return active;
}
void obs_frontend_replay_buffer_start(void) override
@ -267,7 +277,12 @@ struct OBSStudioAPI : obs_frontend_callbacks {
bool obs_frontend_replay_buffer_active(void) override
{
return main->outputHandler->ReplayBufferActive();
bool active;
QMetaObject::invokeMethod(main,
"ReplayBufferActive",
WaitConnection(),
Q_RETURN_ARG(bool, active));
return active;
}
void *obs_frontend_add_tools_menu_qaction(const char *name) override