Compare commits

...

2 Commits

Author SHA1 Message Date
WarmUpTill
5a69e774c2 Fix warnings 2025-12-11 18:43:49 +01:00
WarmUpTill
2389f37ed6 Add temp var for last recording save path 2025-12-11 17:22:37 +01:00
13 changed files with 40 additions and 32 deletions

View File

@@ -2186,6 +2186,8 @@ AdvSceneSwitcher.tempVar.run.process.none.description="When not waiting for the
AdvSceneSwitcher.tempVar.recording.durationSeconds="Recording duration" AdvSceneSwitcher.tempVar.recording.durationSeconds="Recording duration"
AdvSceneSwitcher.tempVar.recording.durationSeconds.description="Recording duration in seconds.\nThis value does not change while the recording is paused and will be reset to zero if the recording is stopped." AdvSceneSwitcher.tempVar.recording.durationSeconds.description="Recording duration in seconds.\nThis value does not change while the recording is paused and will be reset to zero if the recording is stopped."
AdvSceneSwitcher.tempVar.recording.lastSavePath="Last save path"
AdvSceneSwitcher.tempVar.recording.lastSavePath.description="The file path of the last saved recording."
AdvSceneSwitcher.tempVar.video.patternCount="Pattern count" AdvSceneSwitcher.tempVar.video.patternCount="Pattern count"
AdvSceneSwitcher.tempVar.video.patternCount.description="The number of times the given pattern has been found in a given video input frame." AdvSceneSwitcher.tempVar.video.patternCount.description="The number of times the given pattern has been found in a given video input frame."

View File

@@ -28,8 +28,7 @@ static inline void populateActionSelection(QComboBox *list)
} }
MacroActionEdit::MacroActionEdit(QWidget *parent, MacroActionEdit::MacroActionEdit(QWidget *parent,
std::shared_ptr<MacroAction> *entryData, std::shared_ptr<MacroAction> *entryData)
const std::string &id)
: MacroSegmentEdit(parent), : MacroSegmentEdit(parent),
_actionSelection(new FilterComboBox()), _actionSelection(new FilterComboBox()),
_enable(new SwitchButton()), _enable(new SwitchButton()),

View File

@@ -13,10 +13,8 @@ class MacroActionEdit : public MacroSegmentEdit {
Q_OBJECT Q_OBJECT
public: public:
MacroActionEdit( MacroActionEdit(QWidget *parent = nullptr,
QWidget *parent = nullptr, std::shared_ptr<MacroAction> * = nullptr);
std::shared_ptr<MacroAction> * = nullptr,
const std::string &id = MacroAction::GetDefaultID().data());
void SetupWidgets(bool basicSetup = false); void SetupWidgets(bool basicSetup = false);
void SetEntryData(std::shared_ptr<MacroAction> *); void SetEntryData(std::shared_ptr<MacroAction> *);

View File

@@ -100,7 +100,7 @@ void DurationModifierEdit::Collapse(bool collapse)
MacroConditionEdit::MacroConditionEdit( MacroConditionEdit::MacroConditionEdit(
QWidget *parent, std::shared_ptr<MacroCondition> *entryData, QWidget *parent, std::shared_ptr<MacroCondition> *entryData,
const std::string &id, bool isRootCondition) bool isRootCondition)
: MacroSegmentEdit(parent), : MacroSegmentEdit(parent),
_logicSelection(new QComboBox()), _logicSelection(new QComboBox()),
_conditionSelection(new FilterComboBox()), _conditionSelection(new FilterComboBox()),

View File

@@ -34,11 +34,9 @@ class MacroConditionEdit : public MacroSegmentEdit {
Q_OBJECT Q_OBJECT
public: public:
MacroConditionEdit( MacroConditionEdit(QWidget *parent = nullptr,
QWidget *parent = nullptr, std::shared_ptr<MacroCondition> * = nullptr,
std::shared_ptr<MacroCondition> * = nullptr, bool root = true);
const std::string &id = MacroCondition::GetDefaultID().data(),
bool root = true);
bool IsRootNode() const; bool IsRootNode() const;
void SetRootNode(bool); void SetRootNode(bool);
void SetupWidgets(bool basicSetup = false); void SetupWidgets(bool basicSetup = false);

View File

@@ -418,8 +418,7 @@ void MacroEdit::PopulateMacroActions(Macro &m, uint32_t afterIdx)
ui->actionsList->SetVisibilityCheckEnable(false); ui->actionsList->SetVisibilityCheckEnable(false);
for (; afterIdx < actions.size(); afterIdx++) { for (; afterIdx < actions.size(); afterIdx++) {
auto newEntry = new MacroActionEdit(this, &actions[afterIdx], auto newEntry = new MacroActionEdit(this, &actions[afterIdx]);
actions[afterIdx]->GetId());
ui->actionsList->Add(newEntry); ui->actionsList->Add(newEntry);
} }
@@ -444,8 +443,7 @@ void MacroEdit::PopulateMacroElseActions(Macro &m, uint32_t afterIdx)
ui->elseActionsList->SetVisibilityCheckEnable(false); ui->elseActionsList->SetVisibilityCheckEnable(false);
for (; afterIdx < actions.size(); afterIdx++) { for (; afterIdx < actions.size(); afterIdx++) {
auto newEntry = new MacroActionEdit(this, &actions[afterIdx], auto newEntry = new MacroActionEdit(this, &actions[afterIdx]);
actions[afterIdx]->GetId());
ui->elseActionsList->Add(newEntry); ui->elseActionsList->Add(newEntry);
} }
@@ -472,8 +470,7 @@ void MacroEdit::PopulateMacroConditions(Macro &m, uint32_t afterIdx)
for (; afterIdx < conditions.size(); afterIdx++) { for (; afterIdx < conditions.size(); afterIdx++) {
auto newEntry = new MacroConditionEdit( auto newEntry = new MacroConditionEdit(
this, &conditions[afterIdx], this, &conditions[afterIdx], root);
conditions[afterIdx]->GetId(), root);
ui->conditionsList->Add(newEntry); ui->conditionsList->Add(newEntry);
root = false; root = false;
} }
@@ -1083,8 +1080,7 @@ void MacroEdit::AddMacroAction(Macro *macro, int idx, const std::string &id,
RunAndClearPostLoadSteps(); RunAndClearPostLoadSteps();
macro->UpdateActionIndices(); macro->UpdateActionIndices();
ui->actionsList->Insert( ui->actionsList->Insert(
idx, idx, new MacroActionEdit(this, &macro->Actions()[idx]));
new MacroActionEdit(this, &macro->Actions()[idx], id));
SetActionData(*macro); SetActionData(*macro);
} }
HighlightAction(idx); HighlightAction(idx);
@@ -1386,8 +1382,8 @@ void MacroEdit::AddMacroElseAction(Macro *macro, int idx, const std::string &id,
RunAndClearPostLoadSteps(); RunAndClearPostLoadSteps();
macro->UpdateElseActionIndices(); macro->UpdateElseActionIndices();
ui->elseActionsList->Insert( ui->elseActionsList->Insert(
idx, new MacroActionEdit( idx,
this, &macro->ElseActions()[idx], id)); new MacroActionEdit(this, &macro->ElseActions()[idx]));
SetElseActionData(*macro); SetElseActionData(*macro);
} }
HighlightElseAction(idx); HighlightElseAction(idx);
@@ -1589,7 +1585,7 @@ void MacroEdit::AddMacroCondition(Macro *macro, int idx, const std::string &id,
ui->conditionsList->Insert( ui->conditionsList->Insert(
idx, idx,
new MacroConditionEdit(this, &macro->Conditions()[idx], new MacroConditionEdit(this, &macro->Conditions()[idx],
id, idx == 0)); idx == 0));
SetConditionData(*macro); SetConditionData(*macro);
} }
HighlightCondition(idx); HighlightCondition(idx);

View File

@@ -258,7 +258,7 @@ bool IsFullscreen(const std::string &title)
return false; return false;
} }
std::optional<std::string> GetTextInWindow(const std::string &window) std::optional<std::string> GetTextInWindow(const std::string &)
{ {
// Not implemented // Not implemented
return {}; return {};

View File

@@ -56,7 +56,7 @@ std::optional<double> GetDouble(const std::string &str)
std::optional<int> GetInt(const std::string &str) std::optional<int> GetInt(const std::string &str)
{ {
char *end = nullptr; char *end = nullptr;
int value = std::strtol(str.c_str(), &end, 10); int value = (int)std::strtol(str.c_str(), &end, 10);
if (end != str.c_str() && *end == '\0' && value != INT_MAX && if (end != str.c_str() && *end == '\0' && value != INT_MAX &&
value != INT_MIN) { value != INT_MIN) {

View File

@@ -467,9 +467,9 @@ static void setupTab(QTabWidget *tab)
setTabVisible(tab, false); setTabVisible(tab, false);
} }
QWidget::connect( QWidget::connect(VariableSignalManager::Instance(),
VariableSignalManager::Instance(), &VariableSignalManager::Add, &VariableSignalManager::Add, tab,
tab, [tab](const QString &name) { setTabVisible(tab, true); }); [tab](const QString &) { setTabVisible(tab, true); });
} }
void VariableTable::Settings::Save(obs_data_t *data, const char *name) void VariableTable::Settings::Save(obs_data_t *data, const char *name)

View File

@@ -453,7 +453,7 @@ void MacroActionSwitchSceneEdit::SceneSelectionCanvasChanged(
SetWidgetVisibility(); SetWidgetVisibility();
} }
void MacroActionSwitchSceneEdit::ActionChanged(int value) void MacroActionSwitchSceneEdit::ActionChanged(int)
{ {
GUARD_LOADING_AND_LOCK(); GUARD_LOADING_AND_LOCK();
_entryData->_action = static_cast<MacroActionSwitchScene::Action>( _entryData->_action = static_cast<MacroActionSwitchScene::Action>(

View File

@@ -154,7 +154,7 @@ void MacroConditionProcessEdit::ProcessChanged(const QString &text)
QString::fromStdString(_entryData->GetShortDesc())); QString::fromStdString(_entryData->GetShortDesc()));
} }
void MacroConditionProcessEdit::showEvent(QShowEvent *event) void MacroConditionProcessEdit::showEvent(QShowEvent *)
{ {
const QSignalBlocker b(_processSelection); const QSignalBlocker b(_processSelection);
const auto text = _processSelection->currentText(); const auto text = _processSelection->currentText();

View File

@@ -31,6 +31,10 @@ static int currentRecordingDurationInSeconds = 0;
bool MacroConditionRecord::CheckCondition() bool MacroConditionRecord::CheckCondition()
{ {
char *lastSavePath = obs_frontend_get_last_recording();
SetTempVarValue("lastSavePath", lastSavePath ? lastSavePath : "");
bfree(lastSavePath);
switch (_condition) { switch (_condition) {
case Condition::STOP: case Condition::STOP:
return !obs_frontend_recording_active(); return !obs_frontend_recording_active();
@@ -74,6 +78,14 @@ void MacroConditionRecord::SetCondition(Condition condition)
void MacroConditionRecord::SetupTempVars() void MacroConditionRecord::SetupTempVars()
{ {
MacroCondition::SetupTempVars(); MacroCondition::SetupTempVars();
AddTempvar(
"lastSavePath",
obs_module_text(
"AdvSceneSwitcher.tempVar.recording.lastSavePath"),
obs_module_text(
"AdvSceneSwitcher.tempVar.recording.lastSavePath.description"));
switch (_condition) { switch (_condition) {
case Condition::DURATION: case Condition::DURATION:
AddTempvar( AddTempvar(

View File

@@ -106,8 +106,11 @@ target_sources(
# --- variable --- # # --- variable --- #
if(NOT OS_WINDOWS) if(OS_WINDOWS)
target_compile_options(${PROJECT_NAME} PUBLIC -Wno-error=shadow) target_compile_options(${PROJECT_NAME} PRIVATE /wd4100)
else()
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-error=shadow
-Wno-unused-parameter)
endif() endif()
target_sources( target_sources(