Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-14 13:18:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add temp variable support to MIDI condition

Browse Source
This commit is contained in:
WarmUpTill
2023-11-26 00:18:30 +01:00
committed by WarmUpTill
parent 3805aaeeec
commit b525eb7a0e
3 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/locale/en-US.ini
View File

@@ -1442,6 +1442,12 @@ AdvSceneSwitcher.tempVar.date.minute="Minute"
AdvSceneSwitcher.tempVar.date.second="Second"
AdvSceneSwitcher.tempVar.date.dayOfWeek="Day of week"
AdvSceneSwitcher.tempVar.midi.type="Message type"
AdvSceneSwitcher.tempVar.midi.channel="Channel"
AdvSceneSwitcher.tempVar.midi.note="Note"
AdvSceneSwitcher.tempVar.midi.value1="Value 1"
AdvSceneSwitcher.tempVar.midi.value2="Value 2"
AdvSceneSwitcher.selectScene="--select scene--"
AdvSceneSwitcher.selectPreviousScene="Previous Scene"
AdvSceneSwitcher.selectCurrentScene="Current Scene"

33
src/macro-external/midi/macro-condition-midi.cpp
View File

@@ -19,8 +19,7 @@ bool MacroConditionMidi::CheckCondition()
for (const auto &m : *messages) {
if (m.Matches(_message)) {
SetVariableValue(std::to_string(m.Note()) + " " +
std::to_string(m.Value()));
SetVariableValues(m);
return true;
}
}
@@ -49,6 +48,36 @@ std::string MacroConditionMidi::GetShortDesc() const
return _device.Name();
}
void MacroConditionMidi::SetupTempVars()
{
MacroCondition::SetupTempVars();
AddTempvar("type",
obs_module_text("AdvSceneSwitcher.tempVar.midi.type"));
AddTempvar("channel",
obs_module_text("AdvSceneSwitcher.tempVar.midi.channel"));
AddTempvar("note",
obs_module_text("AdvSceneSwitcher.tempVar.midi.note"));
AddTempvar("value1",
obs_module_text("AdvSceneSwitcher.tempVar.midi.value1"));
AddTempvar("value2",
obs_module_text("AdvSceneSwitcher.tempVar.midi.value2"));
}
void MacroConditionMidi::SetVariableValues(const MidiMessage &m)
{
SetVariableValue(std::to_string(m.Note()) + " " +
std::to_string(m.Value()));
SetTempVarValue("type", m.MidiTypeToString(m.Type()));
SetTempVarValue("channel", std::to_string(m.Channel()));
try {
SetTempVarValue("note",
GetAllNotes().at(m.Note()).toStdString());
} catch (...) {
}
SetTempVarValue("value1", std::to_string(m.Note()));
SetTempVarValue("value2", std::to_string(m.Value()));
}
MacroConditionMidiEdit::MacroConditionMidiEdit(
QWidget *parent, std::shared_ptr<MacroConditionMidi> entryData)
: QWidget(parent),

3
src/macro-external/midi/macro-condition-midi.hpp
View File

@@ -24,6 +24,9 @@ public:
MidiMessage _message;
private:
void SetupTempVars();
void SetVariableValues(const MidiMessage &);
static bool _registered;
static const std::string id;
};