mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-02-01 01:52:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

UI: Defer device properties to separate thread

Browse Source 
Because devices can take significant time to enumerate, defer the
properties creation to a separate thread.  The author of this commit
feels a great amount of displeasure over having to write this.
This commit is contained in:
jp9000
2020-08-25 06:30:59 -07:00
parent ab2f3edb2b
commit fcf01304d2
7 changed files with 207 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
UI/window-basic-main.cpp
View File

@@ -908,6 +908,13 @@ void OBSBasic::Load(const char *file)
InitDefaultTransitions();
ClearContextBar();
if (devicePropertiesThread && devicePropertiesThread->isRunning()) {
devicePropertiesThread->wait();
devicePropertiesThread.reset();
}
QApplication::sendPostedEvents(this);
obs_data_t *modulesObj = obs_data_get_obj(data, "modules");
if (api)
api->on_preload(modulesObj);
@@ -2951,7 +2958,6 @@ void OBSBasic::UpdateContextBar()
strcmp(id, "v4l2_input") == 0) {
DeviceCaptureToolbar *c = new DeviceCaptureToolbar(
ui->emptySpace, source);
c->Init();
ui->emptySpace->layout()->addWidget(c);
} else if (strcmp(id, "game_capture") == 0) {
@@ -4193,6 +4199,12 @@ void OBSBasic::closeEvent(QCloseEvent *event)
updateCheckThread->wait();
if (logUploadThread)
logUploadThread->wait();
if (devicePropertiesThread && devicePropertiesThread->isRunning()) {
devicePropertiesThread->wait();
devicePropertiesThread.reset();
}
QApplication::sendPostedEvents(this);
signalHandlers.clear();