From 787a9a3aa65381af62009ab167673577345c2735 Mon Sep 17 00:00:00 2001 From: George Reales Date: Thu, 21 May 2020 10:46:46 +0200 Subject: [PATCH] 1.3 release Added iOS exporter iOS tweaks GUI tweaks via Projucer Larger ADSR faders Editable ADSR values Editable Attenuation dB values Release and Demo builds --- OPL.jucer | 60 ++++++------ Source/OPLLookAndFeel.cpp | 2 +- Source/PluginGui.cpp | 183 ++++++++++++++++++++----------------- Source/PluginGui.h | 4 +- Source/PluginProcessor.cpp | 2 + 5 files changed, 137 insertions(+), 114 deletions(-) diff --git a/OPL.jucer b/OPL.jucer index 7274775..3fb265a 100644 --- a/OPL.jucer +++ b/OPL.jucer @@ -1,6 +1,6 @@ - + pluginVSTCategory="kPlugCategSynth" pluginFormats="buildAU,buildStandalone,buildVST3" + buildVST="0" buildVST3="1" buildAU="1" buildAUv3="0" buildRTAS="0" + buildAAX="0" buildStandalone="1" enableIAA="0"> + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + @@ -113,12 +116,13 @@ - - + + @@ -143,6 +147,9 @@ + @@ -167,6 +174,7 @@ + diff --git a/Source/OPLLookAndFeel.cpp b/Source/OPLLookAndFeel.cpp index fbd23d3..94acd5b 100644 --- a/Source/OPLLookAndFeel.cpp +++ b/Source/OPLLookAndFeel.cpp @@ -22,7 +22,7 @@ OPLLookAndFeel::OPLLookAndFeel() // Prevents an ugly white border from being drawn around a component with keyboard focus. setColour(TextEditor::ColourIds::focusedOutlineColourId, Colours::black); - setColour(Slider::ColourIds::textBoxOutlineColourId, DOS_GREEN); + // setColour(Slider::ColourIds::textBoxOutlineColourId, DOS_GREEN); setColour(TextButton::ColourIds::buttonColourId, DOS_GREEN); setColour(TextButton::ColourIds::buttonOnColourId, DOS_GREEN); diff --git a/Source/PluginGui.cpp b/Source/PluginGui.cpp index 428e704..2158a66 100644 --- a/Source/PluginGui.cpp +++ b/Source/PluginGui.cpp @@ -249,16 +249,16 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) aSlider->setTooltip (TRANS("Envelope attack rate")); aSlider->setRange (0, 15, 1); aSlider->setSliderStyle (Slider::LinearVertical); - aSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 30, 20); - aSlider->setColour (Slider::textBoxOutlineColourId, Colours::transparentBlack); + aSlider->setTextBoxStyle (Slider::TextBoxBelow, false, 30, 20); aSlider->setColour (Slider::thumbColourId, Colour (0xff007f00)); aSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); aSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); aSlider->setColour (Slider::textBoxBackgroundColourId, Colours::black); aSlider->setColour (Slider::textBoxHighlightColourId, Colour (0xff00af00)); + aSlider->setColour (Slider::textBoxOutlineColourId, Colour (0x008e989b)); aSlider->addListener (this); - aSlider->setBounds (40, 208, 30, 88); + aSlider->setBounds (40, 200, 30, 104); aLabel.reset (new Label ("a label", TRANS("A"))); @@ -278,16 +278,16 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) dSlider->setTooltip (TRANS("Envelope decay rate")); dSlider->setRange (0, 15, 1); dSlider->setSliderStyle (Slider::LinearVertical); - dSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 30, 20); - dSlider->setColour (Slider::textBoxOutlineColourId, Colours::transparentBlack); + dSlider->setTextBoxStyle (Slider::TextBoxBelow, false, 30, 20); dSlider->setColour (Slider::thumbColourId, Colour (0xff007f00)); dSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); dSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); dSlider->setColour (Slider::textBoxBackgroundColourId, Colours::black); dSlider->setColour (Slider::textBoxHighlightColourId, Colour (0xff00af00)); + dSlider->setColour (Slider::textBoxOutlineColourId, Colour (0x008e989b)); dSlider->addListener (this); - dSlider->setBounds (88, 208, 30, 88); + dSlider->setBounds (88, 200, 30, 104); dLabel.reset (new Label ("d label", TRANS("D"))); @@ -307,16 +307,16 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) sSlider->setTooltip (TRANS("Envelope sustain level")); sSlider->setRange (0, 15, 1); sSlider->setSliderStyle (Slider::LinearVertical); - sSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 30, 20); - sSlider->setColour (Slider::textBoxOutlineColourId, Colours::transparentBlack); + sSlider->setTextBoxStyle (Slider::TextBoxBelow, false, 30, 20); sSlider->setColour (Slider::thumbColourId, Colour (0xff007f00)); sSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); sSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); sSlider->setColour (Slider::textBoxBackgroundColourId, Colours::black); sSlider->setColour (Slider::textBoxHighlightColourId, Colour (0xff00af00)); + sSlider->setColour (Slider::textBoxOutlineColourId, Colour (0x008e989b)); sSlider->addListener (this); - sSlider->setBounds (136, 208, 30, 88); + sSlider->setBounds (136, 200, 30, 104); dLabel2.reset (new Label ("d label", TRANS("S"))); @@ -336,16 +336,16 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) rSlider->setTooltip (TRANS("Envelope release rate")); rSlider->setRange (0, 15, 1); rSlider->setSliderStyle (Slider::LinearVertical); - rSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 30, 20); - rSlider->setColour (Slider::textBoxOutlineColourId, Colours::transparentBlack); + rSlider->setTextBoxStyle (Slider::TextBoxBelow, false, 30, 20); rSlider->setColour (Slider::thumbColourId, Colour (0xff007f00)); rSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); rSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); rSlider->setColour (Slider::textBoxBackgroundColourId, Colours::black); rSlider->setColour (Slider::textBoxHighlightColourId, Colour (0xff00af00)); + rSlider->setColour (Slider::textBoxOutlineColourId, Colour (0x008e989b)); rSlider->addListener (this); - rSlider->setBounds (184, 208, 30, 88); + rSlider->setBounds (184, 200, 30, 104); rLabel.reset (new Label ("r label", TRANS("R"))); @@ -364,13 +364,13 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible (attenuationSlider.get()); attenuationSlider->setRange (-47.25, 0, 0.75); attenuationSlider->setSliderStyle (Slider::LinearVertical); - attenuationSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 64, 20); - attenuationSlider->setColour (Slider::textBoxOutlineColourId, Colours::transparentBlack); + attenuationSlider->setTextBoxStyle (Slider::TextBoxBelow, false, 64, 20); attenuationSlider->setColour (Slider::thumbColourId, Colour (0xff007f00)); attenuationSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); attenuationSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); attenuationSlider->setColour (Slider::textBoxBackgroundColourId, Colours::black); attenuationSlider->setColour (Slider::textBoxHighlightColourId, Colour (0xff00af00)); + attenuationSlider->setColour (Slider::textBoxOutlineColourId, Colour (0x008e989b)); attenuationSlider->addListener (this); attenuationSlider->setBounds (328, 184, 56, 142); @@ -537,16 +537,16 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible (aSlider2.get()); aSlider2->setRange (0, 15, 1); aSlider2->setSliderStyle (Slider::LinearVertical); - aSlider2->setTextBoxStyle (Slider::TextBoxBelow, true, 40, 20); - aSlider2->setColour (Slider::textBoxOutlineColourId, Colours::transparentBlack); + aSlider2->setTextBoxStyle (Slider::TextBoxBelow, false, 40, 20); aSlider2->setColour (Slider::thumbColourId, Colour (0xff007f00)); aSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00)); aSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); aSlider2->setColour (Slider::textBoxBackgroundColourId, Colours::black); aSlider2->setColour (Slider::textBoxHighlightColourId, Colour (0xff00af00)); + aSlider2->setColour (Slider::textBoxOutlineColourId, Colour (0x008e989b)); aSlider2->addListener (this); - aSlider2->setBounds (464, 208, 30, 88); + aSlider2->setBounds (464, 200, 30, 104); aLabel2.reset (new Label ("a label", TRANS("A"))); @@ -565,16 +565,16 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible (dSlider2.get()); dSlider2->setRange (0, 15, 1); dSlider2->setSliderStyle (Slider::LinearVertical); - dSlider2->setTextBoxStyle (Slider::TextBoxBelow, true, 40, 20); - dSlider2->setColour (Slider::textBoxOutlineColourId, Colours::transparentBlack); + dSlider2->setTextBoxStyle (Slider::TextBoxBelow, false, 40, 20); dSlider2->setColour (Slider::thumbColourId, Colour (0xff007f00)); dSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00)); dSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); dSlider2->setColour (Slider::textBoxBackgroundColourId, Colours::black); dSlider2->setColour (Slider::textBoxHighlightColourId, Colour (0xff00af00)); + dSlider2->setColour (Slider::textBoxOutlineColourId, Colour (0x008e989b)); dSlider2->addListener (this); - dSlider2->setBounds (512, 208, 30, 88); + dSlider2->setBounds (512, 200, 30, 104); dLabel3.reset (new Label ("d label", TRANS("D"))); @@ -593,16 +593,16 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible (sSlider2.get()); sSlider2->setRange (0, 15, 1); sSlider2->setSliderStyle (Slider::LinearVertical); - sSlider2->setTextBoxStyle (Slider::TextBoxBelow, true, 40, 20); - sSlider2->setColour (Slider::textBoxOutlineColourId, Colours::transparentBlack); + sSlider2->setTextBoxStyle (Slider::TextBoxBelow, false, 40, 20); sSlider2->setColour (Slider::thumbColourId, Colour (0xff007f00)); sSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00)); sSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); sSlider2->setColour (Slider::textBoxBackgroundColourId, Colours::black); sSlider2->setColour (Slider::textBoxHighlightColourId, Colour (0xff00af00)); + sSlider2->setColour (Slider::textBoxOutlineColourId, Colour (0x008e989b)); sSlider2->addListener (this); - sSlider2->setBounds (560, 208, 30, 88); + sSlider2->setBounds (560, 200, 30, 104); dLabel4.reset (new Label ("d label", TRANS("S"))); @@ -621,16 +621,16 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible (rSlider2.get()); rSlider2->setRange (0, 15, 1); rSlider2->setSliderStyle (Slider::LinearVertical); - rSlider2->setTextBoxStyle (Slider::TextBoxBelow, true, 40, 20); - rSlider2->setColour (Slider::textBoxOutlineColourId, Colours::transparentBlack); + rSlider2->setTextBoxStyle (Slider::TextBoxBelow, false, 40, 20); rSlider2->setColour (Slider::thumbColourId, Colour (0xff007f00)); rSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00)); rSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); rSlider2->setColour (Slider::textBoxBackgroundColourId, Colours::black); rSlider2->setColour (Slider::textBoxHighlightColourId, Colour (0xff00af00)); + rSlider2->setColour (Slider::textBoxOutlineColourId, Colour (0x008e989b)); rSlider2->addListener (this); - rSlider2->setBounds (608, 208, 30, 88); + rSlider2->setBounds (608, 200, 30, 104); rLabel2.reset (new Label ("r label", TRANS("R"))); @@ -649,13 +649,13 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible (attenuationSlider2.get()); attenuationSlider2->setRange (-47.25, 0, 0.75); attenuationSlider2->setSliderStyle (Slider::LinearVertical); - attenuationSlider2->setTextBoxStyle (Slider::TextBoxBelow, true, 64, 20); - attenuationSlider2->setColour (Slider::textBoxOutlineColourId, Colours::transparentBlack); + attenuationSlider2->setTextBoxStyle (Slider::TextBoxBelow, false, 64, 20); attenuationSlider2->setColour (Slider::thumbColourId, Colour (0xff007f00)); attenuationSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00)); attenuationSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); attenuationSlider2->setColour (Slider::textBoxBackgroundColourId, Colours::black); attenuationSlider2->setColour (Slider::textBoxHighlightColourId, Colour (0xff00af00)); + attenuationSlider2->setColour (Slider::textBoxOutlineColourId, Colour (0x008e989b)); attenuationSlider2->addListener (this); attenuationSlider2->setBounds (752, 184, 56, 142); @@ -809,12 +809,12 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) tremoloSlider->setRange (1, 4.8, 3.8); tremoloSlider->setSliderStyle (Slider::LinearHorizontal); tremoloSlider->setTextBoxStyle (Slider::TextBoxRight, true, 32, 20); - tremoloSlider->setColour (Slider::textBoxOutlineColourId, Colours::transparentBlack); tremoloSlider->setColour (Slider::thumbColourId, Colour (0xff007f00)); tremoloSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); tremoloSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); tremoloSlider->setColour (Slider::textBoxBackgroundColourId, Colours::black); tremoloSlider->setColour (Slider::textBoxHighlightColourId, Colour (0xff00af00)); + tremoloSlider->setColour (Slider::textBoxOutlineColourId, Colour (0x008e989b)); tremoloSlider->addListener (this); tremoloSlider->setBounds (112, 472, 80, 24); @@ -850,12 +850,12 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) vibratoSlider->setRange (7, 14, 7); vibratoSlider->setSliderStyle (Slider::LinearHorizontal); vibratoSlider->setTextBoxStyle (Slider::TextBoxRight, true, 32, 20); - vibratoSlider->setColour (Slider::textBoxOutlineColourId, Colours::transparentBlack); vibratoSlider->setColour (Slider::thumbColourId, Colour (0xff007f00)); vibratoSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); vibratoSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); vibratoSlider->setColour (Slider::textBoxBackgroundColourId, Colours::black); vibratoSlider->setColour (Slider::textBoxHighlightColourId, Colour (0xff00af00)); + vibratoSlider->setColour (Slider::textBoxOutlineColourId, Colour (0x008e989b)); vibratoSlider->addListener (this); vibratoSlider->setBounds (112, 512, 80, 24); @@ -892,7 +892,6 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) feedbackSlider->setRange (0, 7, 1); feedbackSlider->setSliderStyle (Slider::RotaryHorizontalVerticalDrag); feedbackSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 30, 20); - feedbackSlider->setColour (Slider::textBoxOutlineColourId, Colours::transparentBlack); feedbackSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); feedbackSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); feedbackSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xff00af00)); @@ -900,9 +899,10 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) feedbackSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); feedbackSlider->setColour (Slider::textBoxBackgroundColourId, Colours::black); feedbackSlider->setColour (Slider::textBoxHighlightColourId, Colour (0xff00af00)); + feedbackSlider->setColour (Slider::textBoxOutlineColourId, Colour (0x008e989b)); feedbackSlider->addListener (this); - feedbackSlider->setBounds (248, 237, 30, 59); + feedbackSlider->setBounds (248, 237, 30, 67); frequencyLabel7.reset (new Label ("frequency label", TRANS("Feedback"))); @@ -1893,7 +1893,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) attenuationLabel5->setColour (TextEditor::textColourId, Colours::black); attenuationLabel5->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); - attenuationLabel5->setBounds (323, 376, 80, 48); + attenuationLabel5->setBounds (328, 376, 80, 48); fmButton.reset (new ImageButton ("fm button")); addAndMakeVisible (fmButton.get()); @@ -1903,10 +1903,10 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) fmButton->addListener (this); fmButton->setImages (false, true, true, - ImageCache::getFromMemory (twoopFm_png, twoopFm_pngSize), 0.500f, Colour (0x00000000), + ImageCache::getFromMemory (twoopAm_png, twoopAm_pngSize), 0.500f, Colour (0x00000000), Image(), 0.500f, Colour (0x00000000), Image(), 1.000f, Colour (0x00000000)); - fmButton->setBounds (301, 464, 72, 72); + fmButton->setBounds (304, 472, 56, 56); additiveButton.reset (new ImageButton ("Additive mode button")); addAndMakeVisible (additiveButton.get()); @@ -1916,10 +1916,10 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) additiveButton->addListener (this); additiveButton->setImages (false, true, true, - ImageCache::getFromMemory (twoopAm_png, twoopAm_pngSize), 0.500f, Colour (0x00000000), + ImageCache::getFromMemory (twoopFm_png, twoopFm_pngSize), 0.500f, Colour (0x00000000), Image(), 0.500f, Colour (0x00000000), Image(), 1.000f, Colour (0x00000000)); - additiveButton->setBounds (402, 472, 56, 56); + additiveButton->setBounds (392, 464, 72, 72); bassDrumButton.reset (new ImageButton ("bass drum button")); addAndMakeVisible (bassDrumButton.get()); @@ -2168,7 +2168,12 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) addAndMakeVisible(channel); channels[i] = channel; } - versionLabel->setText(String(ProjectInfo::versionString), NotificationType::dontSendNotification); + + versionLabel->setText(String(ProjectInfo::versionString).dropLastCharacters(2) +#if DEMOVERSION + += " Demo" +#endif + , NotificationType::dontSendNotification); //[/UserPreSize] @@ -2732,7 +2737,7 @@ void PluginGui::buttonClicked (Button* buttonThatWasClicked) FileChooser browser("Select SBI instrument file", instrumentLoadDirectory, #ifdef JUCE_IOS - "*"); + "*.sbi"); #endif #ifndef JUCE_IOS @@ -3001,11 +3006,11 @@ BEGIN_JUCER_METADATA fontname="Default font" fontsize="15.0" kerning="0.0" bold="0" italic="0" justification="33"/>