Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-12 04:11:06 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Save macro segment settings in separate object

Browse Source 
To avoid conflicts with other setting of the segment
This commit is contained in:
WarmUpTill
2024-04-20 12:30:40 +02:00
committed by WarmUpTill
parent 26e854f0a3
commit cdacfc946c
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/macro/macro-segment.cpp
View File

@@ -20,17 +20,30 @@ MacroSegment::MacroSegment(Macro *m, bool supportsVariableValue)
bool MacroSegment::Save(obs_data_t *obj) const
{
obs_data_set_bool(obj, "collapsed", _collapsed);
obs_data_set_bool(obj, "useCustomLabel", _useCustomLabel);
obs_data_set_string(obj, "customLabel", _customLabel.c_str());
OBSDataAutoRelease data = obs_data_create();
obs_data_set_bool(data, "collapsed", _collapsed);
obs_data_set_bool(data, "useCustomLabel", _useCustomLabel);
obs_data_set_string(data, "customLabel", _customLabel.c_str());
obs_data_set_obj(obj, "segmentSettings", data);
return true;
}
bool MacroSegment::Load(obs_data_t *obj)
{
_collapsed = obs_data_get_bool(obj, "collapsed");
_useCustomLabel = obs_data_get_bool(obj, "useCustomLabel");
_customLabel = obs_data_get_string(obj, "customLabel");
// TODO: remove this fallback at some point
if (obs_data_has_user_value(obj, "segmentSettings")) {
OBSDataAutoRelease data =
obs_data_get_obj(obj, "segmentSettings");
_collapsed = obs_data_get_bool(data, "collapsed");
_useCustomLabel = obs_data_get_bool(data, "useCustomLabel");
_customLabel = obs_data_get_string(data, "customLabel");
} else {
_collapsed = obs_data_get_bool(obj, "collapsed");
_useCustomLabel = false;
_customLabel = obs_module_text(
"AdvSceneSwitcher.macroTab.segment.defaultCustomLabel");
}
ClearAvailableTempvars();
return true;
}