Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-09-07 09:05:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for variables in various path selections

Browse Source
This commit is contained in:
WarmUpTill
2023-03-18 22:56:49 +01:00
committed by WarmUpTill
parent b607940c8c
commit 2806fd6cdb
10 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/utils/process-config.cpp
View File

@@ -8,9 +8,8 @@
bool ProcessConfig::Save(obs_data_t *obj) const
{
auto data = obs_data_create();
obs_data_set_string(data, "path", _path.c_str());
obs_data_set_string(data, "workingDirectory",
_workingDirectory.c_str());
_path.Save(data, "path");
_workingDirectory.Save(data, "workingDirectory");
_args.Save(data, "args", "arg");
obs_data_set_obj(obj, "processConfig", data);
obs_data_release(data);
@@ -29,8 +28,8 @@ bool ProcessConfig::Load(obs_data_t *obj)
}
auto data = obs_data_get_obj(obj, "processConfig");
_path = obs_data_get_string(data, "path");
_workingDirectory = obs_data_get_string(data, "workingDirectory");
_path.Load(data, "path");
_workingDirectory.Load(data, "workingDirectory");
_args.Load(data, "args", "arg");
obs_data_release(data);
return true;
@@ -101,12 +100,12 @@ ProcessConfigEdit::ProcessConfigEdit(QWidget *parent)
void ProcessConfigEdit::SetProcessConfig(const ProcessConfig &conf)
{
_conf = conf;
_filePath->SetPath(QString::fromStdString(conf._path));
_filePath->SetPath(conf._path);
_argList->SetStringList(conf._args);
_workingDirectory->SetPath(
QString::fromStdString(conf._workingDirectory));
ShowAdvancedSettings(!_conf._args.empty() ||
!_conf._workingDirectory.empty());
_workingDirectory->SetPath(conf._workingDirectory);
ShowAdvancedSettings(
!_conf._args.empty() ||
!_conf._workingDirectory.UnresolvedValue().empty());
}
void ProcessConfigEdit::PathChanged(const QString &text)

9
src/utils/process-config.hpp
View File

@@ -15,13 +15,14 @@ public:
bool Save(obs_data_t *obj) const;
bool Load(obs_data_t *obj);
std::string Path() const { return _path; }
std::string WorkingDir() const { return _workingDirectory; }
std::string Path() { return _path; }
std::string UnresolvedPath() const { return _path.UnresolvedValue(); }
std::string WorkingDir() { return _workingDirectory; }
QStringList Args(); // Resolves variables
private:
std::string _path = obs_module_text("AdvSceneSwitcher.enterPath");
std::string _workingDirectory = "";
StringVariable _path = obs_module_text("AdvSceneSwitcher.enterPath");
StringVariable _workingDirectory = "";
StringList _args;
friend class ProcessConfigEdit;