diff --git a/lib/macro/macro-segment-selection.cpp b/lib/macro/macro-segment-selection.cpp index a3ad57f2..ec165c37 100644 --- a/lib/macro/macro-segment-selection.cpp +++ b/lib/macro/macro-segment-selection.cpp @@ -21,7 +21,7 @@ MacroSegmentSelection::MacroSegmentSelection(QWidget *parent, Type type, { _index->setMinimum(0); _index->setMaximum(99); - _index->specialValueText("-"); + _index->setSpecialValueText("-"); if (!allowVariables) { _index->DisableVariableSelection(); } diff --git a/lib/variables/variable-number.tpp b/lib/variables/variable-number.tpp index db67d144..cf87f70d 100644 --- a/lib/variables/variable-number.tpp +++ b/lib/variables/variable-number.tpp @@ -82,9 +82,10 @@ template bool NumberVariable::HasValidValue() const auto value = var->IntValue(); return value.has_value(); } else if constexpr (std::is_same::value) { - auto value = var->IntValue(); + auto value = var->DoubleValue(); return value.has_value(); } + assert(false); return false; } diff --git a/lib/variables/variable-spinbox.cpp b/lib/variables/variable-spinbox.cpp index 675d72d5..6b65b31e 100644 --- a/lib/variables/variable-spinbox.cpp +++ b/lib/variables/variable-spinbox.cpp @@ -101,7 +101,7 @@ void GenericVaraiableSpinbox::setSuffix(const QString &suffix) _fixedValueDouble->setSuffix(suffix); } -void GenericVaraiableSpinbox::specialValueText(const QString &text) +void GenericVaraiableSpinbox::setSpecialValueText(const QString &text) { _fixedValueInt->setSpecialValueText(text); _fixedValueDouble->setSpecialValueText(text); diff --git a/lib/variables/variable-spinbox.hpp b/lib/variables/variable-spinbox.hpp index c0d9ac24..9371fda2 100644 --- a/lib/variables/variable-spinbox.hpp +++ b/lib/variables/variable-spinbox.hpp @@ -23,7 +23,7 @@ public: void setPrefix(const QString &prefix); void setSuffix(const QString &suffix); - void specialValueText(const QString &text); + void setSpecialValueText(const QString &text); public slots: void SetFixedValue(int); diff --git a/plugins/base/macro-action-audio.cpp b/plugins/base/macro-action-audio.cpp index fab8383b..2f0d0739 100644 --- a/plugins/base/macro-action-audio.cpp +++ b/plugins/base/macro-action-audio.cpp @@ -461,7 +461,7 @@ MacroActionAudioEdit::MacroActionAudioEdit( _volumeDB->setMinimum(-100); _volumeDB->setMaximum(0); _volumeDB->setSuffix("dB"); - _volumeDB->specialValueText("-inf"); + _volumeDB->setSpecialValueText("-inf"); _rate->setMinimum(0.01); _rate->setMaximum(999.); diff --git a/plugins/base/macro-condition-audio.cpp b/plugins/base/macro-condition-audio.cpp index 4e7d0ec1..13a04817 100644 --- a/plugins/base/macro-condition-audio.cpp +++ b/plugins/base/macro-condition-audio.cpp @@ -478,7 +478,7 @@ MacroConditionAudioEdit::MacroConditionAudioEdit( _volumeDB->setMinimum(-100); _volumeDB->setMaximum(0); _volumeDB->setSuffix("dB"); - _volumeDB->specialValueText("-inf"); + _volumeDB->setSpecialValueText("-inf"); _syncOffset->setMinimum(-950); _syncOffset->setMaximum(20000); diff --git a/plugins/midi/midi-helpers.cpp b/plugins/midi/midi-helpers.cpp index 88df2634..ceb7f003 100644 --- a/plugins/midi/midi-helpers.cpp +++ b/plugins/midi/midi-helpers.cpp @@ -782,11 +782,11 @@ MidiMessageSelection::MidiMessageSelection(QWidget *parent) "Note.svg"); SetButtonIcon(_noteValueStringToggle, path.c_str()); - _channel->specialValueText( + _channel->setSpecialValueText( obs_module_text("AdvSceneSwitcher.midi.message.placeholder")); - _noteValue->specialValueText( + _noteValue->setSpecialValueText( obs_module_text("AdvSceneSwitcher.midi.message.placeholder")); - _value->specialValueText( + _value->setSpecialValueText( obs_module_text("AdvSceneSwitcher.midi.message.placeholder")); _channel->setMinimum(MidiMessage::optionalChannelIndicator);