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

61
modules/juce_gui_basics/properties/juce_MultiChoicePropertyComponent.cpp
View File

@ -106,10 +106,10 @@ class MultiChoicePropertyComponent::MultiChoiceRemapperSourceWithDefault : pu
private Value::Listener
{
public:
MultiChoiceRemapperSourceWithDefault (ValueWithDefault& vwd, var v, int c, ToggleButton* b)
MultiChoiceRemapperSourceWithDefault (ValueWithDefault* vwd, var v, int c, ToggleButton* b)
: valueWithDefault (vwd),
varToControl (v),
sourceValue (valueWithDefault.getPropertyAsValue()),
sourceValue (valueWithDefault->getPropertyAsValue()),
maxChoices (c),
buttonToControl (b)
{
@ -118,7 +118,10 @@ public:
var getValue() const override
{
auto v = valueWithDefault.get();
if (valueWithDefault == nullptr)
return {};
auto v = valueWithDefault->get();
if (auto* arr = v.getArray())
{
@ -134,11 +137,14 @@ public:
void setValue (const var& newValue) override
{
auto v = valueWithDefault.get();
if (valueWithDefault == nullptr)
return;
auto v = valueWithDefault->get();
OptionalScopedPointer<Array<var>> arrayToControl;
if (valueWithDefault.isUsingDefault())
if (valueWithDefault->isUsingDefault())
arrayToControl.set (new Array<var>(), true); // use an empty array so the default values are overwritten
else
arrayToControl.set (v.getArray(), false);
@ -149,7 +155,7 @@ public:
bool newState = newValue;
if (valueWithDefault.isUsingDefault())
if (valueWithDefault->isUsingDefault())
{
if (auto* defaultArray = v.getArray())
{
@ -171,15 +177,27 @@ public:
StringComparator c;
temp.sort (c);
valueWithDefault = temp;
*valueWithDefault = temp;
if (temp.size() == 0)
valueWithDefault.resetToDefault();
valueWithDefault->resetToDefault();
}
}
private:
ValueWithDefault& valueWithDefault;
//==============================================================================
void valueChanged (Value&) override { sendChangeMessage (true); }
void updateButtonTickColour() const noexcept
{
auto alpha = valueWithDefault->isUsingDefault() ? 0.4f : 1.0f;
auto baseColour = buttonToControl->findColour (ToggleButton::tickColourId);
buttonToControl->setColour (ToggleButton::tickColourId, baseColour.withAlpha (alpha));
}
//==============================================================================
WeakReference<ValueWithDefault> valueWithDefault;
var varToControl;
Value sourceValue;
@ -187,17 +205,6 @@ private:
ToggleButton* buttonToControl;
//==============================================================================
void valueChanged (Value&) override { sendChangeMessage (true); }
void updateButtonTickColour() const noexcept
{
auto alpha = valueWithDefault.isUsingDefault() ? 0.4f : 1.0f;
auto baseColour = buttonToControl->findColour (ToggleButton::tickColourId);
buttonToControl->setColour (ToggleButton::tickColourId, baseColour.withAlpha (alpha));
}
//==============================================================================
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MultiChoiceRemapperSourceWithDefault)
};
@ -254,16 +261,24 @@ MultiChoicePropertyComponent::MultiChoicePropertyComponent (ValueWithDefault& va
int maxChoices)
: MultiChoicePropertyComponent (propertyName, choices, correspondingValues)
{
valueWithDefault = &valueToControl;
// The value to control must be an array!
jassert (valueToControl.get().isArray());
jassert (valueWithDefault->get().isArray());
for (int i = 0; i < choiceButtons.size(); ++i)
choiceButtons[i]->getToggleStateValue().referTo (Value (new MultiChoiceRemapperSourceWithDefault (valueToControl,
choiceButtons[i]->getToggleStateValue().referTo (Value (new MultiChoiceRemapperSourceWithDefault (valueWithDefault,
correspondingValues[i],
maxChoices,
choiceButtons[i])));
valueToControl.onDefaultChange = [this] { repaint(); };
valueWithDefault->onDefaultChange = [this] { repaint(); };
}
MultiChoicePropertyComponent::~MultiChoicePropertyComponent()
{
if (valueWithDefault != nullptr)
valueWithDefault->onDefaultChange = nullptr;
}
void MultiChoicePropertyComponent::paint (Graphics& g)