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

Revert "UI: Only defer property updates for input and transition sources"

Browse Source 
This reverts commit 58fb63030cf2ee858ccf72d242cfabf3394f16f1.

This is not the ideal fix for the fact that scripts can use a deferred
update flag because it makes it so that filters in general cannot use
flags. We need to disable this via other means.
This commit is contained in:
Lain 2023-08-03 16:09:25 -07:00
parent 499ddfb32c
commit d2d3e46e14
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
UI/properties-view.cpp
View File

@ -90,33 +90,19 @@ Q_DECLARE_METATYPE(media_frames_per_second);
void OBSPropertiesView::ReloadProperties() void OBSPropertiesView::ReloadProperties()
{ {
deferUpdate = false;
if (weakObj || rawObj) { if (weakObj || rawObj) {
OBSObject strongObj = GetObject(); OBSObject strongObj = GetObject();
void *obj = strongObj ? strongObj.Get() : rawObj; void *obj = strongObj ? strongObj.Get() : rawObj;
if (obj) { if (obj)
properties.reset(reloadCallback(obj)); properties.reset(reloadCallback(obj));
if (obs_obj_get_type(obj) == OBS_OBJ_TYPE_SOURCE) {
enum obs_source_type type = obs_source_get_type(
(obs_source_t *)obj);
if (type == OBS_SOURCE_TYPE_INPUT ||
type == OBS_SOURCE_TYPE_TRANSITION) {
uint32_t flags =
obs_properties_get_flags(
properties.get());
deferUpdate =
(flags &
OBS_PROPERTIES_DEFER_UPDATE) !=
0;
}
}
}
} else { } else {
properties.reset(reloadCallback((void *)type.c_str())); properties.reset(reloadCallback((void *)type.c_str()));
obs_properties_apply_settings(properties.get(), settings); obs_properties_apply_settings(properties.get(), settings);
} }
uint32_t flags = obs_properties_get_flags(properties.get());
deferUpdate = (flags & OBS_PROPERTIES_DEFER_UPDATE) != 0;
RefreshProperties(); RefreshProperties();
} }

4
docs/sphinx/reference-properties.rst
View File

@ -51,9 +51,7 @@ General Functions
- OBS_PROPERTIES_DEFER_UPDATE - A hint that tells the - OBS_PROPERTIES_DEFER_UPDATE - A hint that tells the
front-end to defers updating the settings until the front-end to defers updating the settings until the
user has finished editing all properties rather than user has finished editing all properties rather than
immediately updating any settings. Currently only immediately updating any settings
works for properties of input and transition sources,
this flag is a no-op for other properties at this time.
--------------------- ---------------------