blumia/juicysfplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to JUCE 5.4.3. Remove (probably) unused JUCE modules. Remove VST2 target (it's been end-of-life'd by Steinberg and by JUCE)

Browse Source
This commit is contained in:
Alex Birch
2019-06-22 20:41:38 +01:00
parent d22c2cd4fa
commit 9ee566b251
1140 changed files with 67534 additions and 105952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp
View File

@ -73,9 +73,9 @@ class ChoicePropertyComponent::RemapperValueSourceWithDefault : public Value:
private Value::Listener
{
public:
RemapperValueSourceWithDefault (ValueWithDefault& vwd, const Array<var>& map)
RemapperValueSourceWithDefault (ValueWithDefault* vwd, const Array<var>& map)
: valueWithDefault (vwd),
sourceValue (valueWithDefault.getPropertyAsValue()),
sourceValue (valueWithDefault->getPropertyAsValue()),
mappings (map)
{
sourceValue.addListener (this);
@ -83,7 +83,10 @@ public:
var getValue() const override
{
if (valueWithDefault.isUsingDefault())
if (valueWithDefault == nullptr)
return {};
if (valueWithDefault->isUsingDefault())
return -1;
auto targetValue = sourceValue.getValue();
@ -97,28 +100,31 @@ public:
void setValue (const var& newValue) override
{
if (valueWithDefault == nullptr)
return;
auto newValueInt = static_cast<int> (newValue);
if (newValueInt == -1)
{
valueWithDefault.resetToDefault();
valueWithDefault->resetToDefault();
}
else
{
auto remappedVal = mappings [newValueInt - 1];
if (! remappedVal.equalsWithSameType (sourceValue))
valueWithDefault = remappedVal;
*valueWithDefault = remappedVal;
}
}
private:
ValueWithDefault& valueWithDefault;
void valueChanged (Value&) override { sendChangeMessage (true); }
WeakReference<ValueWithDefault> valueWithDefault;
Value sourceValue;
Array<var> mappings;
void valueChanged (Value&) override { sendChangeMessage (true); }
//==============================================================================
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (RemapperValueSourceWithDefault)
};
@ -161,17 +167,19 @@ ChoicePropertyComponent::ChoicePropertyComponent (ValueWithDefault& valueToContr
const Array<var>& correspondingValues)
: ChoicePropertyComponent (name, choiceList, correspondingValues)
{
createComboBoxWithDefault (choiceList [correspondingValues.indexOf (valueToControl.getDefault())]);
valueWithDefault = &valueToControl;
comboBox.getSelectedIdAsValue().referTo (Value (new RemapperValueSourceWithDefault (valueToControl,
createComboBoxWithDefault (choiceList [correspondingValues.indexOf (valueWithDefault->getDefault())]);
comboBox.getSelectedIdAsValue().referTo (Value (new RemapperValueSourceWithDefault (valueWithDefault,
correspondingValues)));
valueToControl.onDefaultChange = [this, &valueToControl, choiceList, correspondingValues]
valueWithDefault->onDefaultChange = [this, choiceList, correspondingValues]
{
auto selectedId = comboBox.getSelectedId();
comboBox.clear();
createComboBoxWithDefault (choiceList [correspondingValues.indexOf (valueToControl.getDefault())]);
createComboBoxWithDefault (choiceList [correspondingValues.indexOf (valueWithDefault->getDefault())]);
comboBox.setSelectedId (selectedId);
};
@ -182,17 +190,19 @@ ChoicePropertyComponent::ChoicePropertyComponent (ValueWithDefault& valueToContr
: PropertyComponent (name),
choices ({ "Enabled", "Disabled" })
{
createComboBoxWithDefault (valueToControl.getDefault() ? "Enabled" : "Disabled");
valueWithDefault = &valueToControl;
comboBox.getSelectedIdAsValue().referTo (Value (new RemapperValueSourceWithDefault (valueToControl,
createComboBoxWithDefault (valueWithDefault->getDefault() ? "Enabled" : "Disabled");
comboBox.getSelectedIdAsValue().referTo (Value (new RemapperValueSourceWithDefault (valueWithDefault,
{ true, false })));
valueToControl.onDefaultChange = [this, &valueToControl]
valueWithDefault->onDefaultChange = [this]
{
auto selectedId = comboBox.getSelectedId();
comboBox.clear();
createComboBoxWithDefault (valueToControl.getDefault() ? "Enabled" : "Disabled");
createComboBoxWithDefault (valueWithDefault->getDefault() ? "Enabled" : "Disabled");
comboBox.setSelectedId (selectedId);
};
@ -200,6 +210,8 @@ ChoicePropertyComponent::ChoicePropertyComponent (ValueWithDefault& valueToContr
ChoicePropertyComponent::~ChoicePropertyComponent()
{
if (valueWithDefault != nullptr)
valueWithDefault->onDefaultChange = nullptr;
}
//==============================================================================