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

UI: Rename visual update callback variable

Browse Source 
Having both a "callback" and "cb" doesn't make sense. One is
specifically for visual updates only, the other is for actual updates,
so use an appropriate name for both
This commit is contained in:
jp9000 2022-03-09 09:14:32 -08:00
parent 45f737fb30
commit e5f57a1e03
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
UI/properties-view.cpp
View File

@ -180,14 +180,15 @@ void OBSPropertiesView::GetScrollPos(int &h, int &v)
OBSPropertiesView::OBSPropertiesView(OBSData settings_, obs_object_t *obj,
PropertiesReloadCallback reloadCallback,
PropertiesUpdateCallback callback_,
PropertiesVisualUpdateCb cb_, int minSize_)
PropertiesVisualUpdateCb visUpdateCb_,
int minSize_)
: VScrollArea(nullptr),
properties(nullptr, obs_properties_destroy),
settings(settings_),
weakObj(obs_object_get_weak_object(obj)),
reloadCallback(reloadCallback),
callback(callback_),
cb(cb_),
visUpdateCb(visUpdateCb_),
minSize(minSize_)
{
setFrameShape(QFrame::NoFrame);
@ -198,14 +199,15 @@ OBSPropertiesView::OBSPropertiesView(OBSData settings_, obs_object_t *obj,
OBSPropertiesView::OBSPropertiesView(OBSData settings_, void *obj,
PropertiesReloadCallback reloadCallback,
PropertiesUpdateCallback callback_,
PropertiesVisualUpdateCb cb_, int minSize_)
PropertiesVisualUpdateCb visUpdateCb_,
int minSize_)
: VScrollArea(nullptr),
properties(nullptr, obs_properties_destroy),
settings(settings_),
rawObj(obj),
reloadCallback(reloadCallback),
callback(callback_),
cb(cb_),
visUpdateCb(visUpdateCb_),
minSize(minSize_)
{
setFrameShape(QFrame::NoFrame);
@ -2028,11 +2030,11 @@ void WidgetInfo::ControlChanged()
blog(LOG_DEBUG, "No update timer or no callback!");
}
if (view->cb && !view->deferUpdate) {
if (view->visUpdateCb && !view->deferUpdate) {
OBSObject strongObj = view->GetObject();
void *obj = strongObj ? strongObj.Get() : view->rawObj;
if (obj)
view->cb(obj, view->settings);
view->visUpdateCb(obj, view->settings);
}
view->SignalChanged();

2
UI/properties-view.hpp
View File

@ -102,7 +102,7 @@ private:
std::string type;
PropertiesReloadCallback reloadCallback;
PropertiesUpdateCallback callback = nullptr;
PropertiesVisualUpdateCb cb = nullptr;
PropertiesVisualUpdateCb visUpdateCb = nullptr;
int minSize;
std::vector<std::unique_ptr<WidgetInfo>> children;
std::string lastFocused;