jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

frontend-tools: Don't give every loaded filter focus

Browse Source 
Speeds up loading with large number of filters and prevents deadlock by
not getting the properties of filters during
OBSBasicFilters::UpdateFilters() which uses the source->filter_mutex
This commit is contained in:
Exeldro 2020-11-24 07:11:49 +01:00 committed by Jim
parent a88b262d5f
commit 02f47345cf
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
UI/window-basic-filters.cpp
View File

@ -225,7 +225,7 @@ void OBSBasicFilters::UpdateProperties(void *data, calldata_t *)
"ReloadProperties");
}
void OBSBasicFilters::AddFilter(OBSSource filter)
void OBSBasicFilters::AddFilter(OBSSource filter, bool focus)
{
uint32_t flags = obs_source_get_output_flags(filter);
bool async = (flags & OBS_SOURCE_ASYNC) != 0;
@ -238,7 +238,8 @@ void OBSBasicFilters::AddFilter(OBSSource filter)
item->setData(Qt::UserRole, QVariant::fromValue(filter));
list->addItem(item);
list->setCurrentItem(item);
if (focus)
list->setCurrentItem(item);
SetupVisibilityItem(list, item, filter);
}
@ -352,10 +353,16 @@ void OBSBasicFilters::UpdateFilters()
OBSBasicFilters *window =
reinterpret_cast<OBSBasicFilters *>(p);
window->AddFilter(filter);
window->AddFilter(filter, false);
},
this);
if (ui->asyncFilters->count() > 0) {
ui->asyncFilters->setCurrentItem(ui->asyncFilters->item(0));
} else if (ui->effectFilters->count() > 0) {
ui->effectFilters->setCurrentItem(ui->effectFilters->item(0));
}
main->SaveProject();
}

2
UI/window-basic-filters.hpp
View File

@ -78,7 +78,7 @@ private:
bool editActive = false;
private slots:
void AddFilter(OBSSource filter);
void AddFilter(OBSSource filter, bool focus = true);
void RemoveFilter(OBSSource filter);
void ReorderFilters();
void RenameAsyncFilter();