diff --git a/OPL.jucer b/OPL.jucer index 1587193..7274775 100644 --- a/OPL.jucer +++ b/OPL.jucer @@ -1,6 +1,6 @@ - + + - - + + @@ -135,7 +138,8 @@ - + diff --git a/Source/PluginGui.cpp b/Source/PluginGui.cpp index bc4af86..428e704 100644 --- a/Source/PluginGui.cpp +++ b/Source/PluginGui.cpp @@ -7,7 +7,7 @@ the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded and re-saved. - Created with Projucer version: 5.3.2 + Created with Projucer version: 5.4.7 ------------------------------------------------------------------------------ @@ -144,6 +144,7 @@ void PluginGui::updateFromParameters() tooltipWindow.setColour(tooltipWindow.backgroundColourId, Colour(0x0)); tooltipWindow.setColour(tooltipWindow.textColourId, Colour(COLOUR_MID)); + } void PluginGui::setRecordButtonState(bool recording) { @@ -162,7 +163,6 @@ void PluginGui::setRecordButtonState(bool recording) { //============================================================================== PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) - : AudioProcessorEditor (ownerFilter) { //[Constructor_pre] You can add your own custom stuff here.. //[/Constructor_pre] @@ -2169,6 +2169,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter) channels[i] = channel; } versionLabel->setText(String(ProjectInfo::versionString), NotificationType::dontSendNotification); + //[/UserPreSize] setSize (860, 580); @@ -2364,11 +2365,6 @@ void PluginGui::resized() { //[UserPreResize] Add your own custom resize code here.. //[/UserPreResize] - -#ifdef JUCE_IOS - auto& desktop = Desktop::getInstance(); - desktop.setGlobalScaleFactor(1.185); // scaling factor -#endif //[UserResized] Add your own custom resize handling here.. for (unsigned int i = 0; i < channels.size(); ++i) @@ -2703,7 +2699,7 @@ void PluginGui::buttonClicked (Button* buttonThatWasClicked) #ifdef JUCE_IOS "*"); #endif - + #ifndef JUCE_IOS "*.sbi"); #endif @@ -2738,7 +2734,7 @@ void PluginGui::buttonClicked (Button* buttonThatWasClicked) #ifdef JUCE_IOS "*"); #endif - + #ifndef JUCE_IOS "*.sbi"); #endif @@ -2972,8 +2968,8 @@ void PluginGui::buttonClicked (Button* buttonThatWasClicked) BEGIN_JUCER_METADATA @@ -3002,113 +2998,107 @@ BEGIN_JUCER_METADATA virtualName="" explicitFocusOrder="0" pos="40 168 152 24" tooltip="Multiplier applied to base note frequency" textCol="ff007f00" edTextCol="ff000000" edBkgCol="0" labelText="Frequency Multiplier" editableSingleClick="0" editableDoubleClick="0" focusDiscardsChanges="0" - fontname="Default font" fontsize="15.00000000000000000000" kerning="0.00000000000000000000" - bold="0" italic="0" justification="33"/> + fontname="Default font" fontsize="15.0" kerning="0.0" bold="0" + italic="0" justification="33"/> + textboxbkgd="ff000000" textboxhighlight="ff00af00" min="0.0" + max="15.0" int="1.0" style="LinearVertical" textBoxPos="TextBoxBelow" + textBoxEditable="0" textBoxWidth="30" textBoxHeight="20" skewFactor="1.0" + needsCallback="1"/> END_JUCER_METADATA @@ -4238,3 +4162,4 @@ const int PluginGui::adlib_pngSize = 1605; //[EndFile] You can add extra defines here... //[/EndFile] + diff --git a/Source/PluginGui.h b/Source/PluginGui.h index 0a085f3..7c05a0a 100644 --- a/Source/PluginGui.h +++ b/Source/PluginGui.h @@ -7,7 +7,7 @@ the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded and re-saved. - Created with Projucer version: 5.3.2 + Created with Projucer version: 5.4.7 ------------------------------------------------------------------------------ @@ -33,7 +33,7 @@ This is a GUI for the OPL2 VST plugin, created in Juce. //[/Comments] */ -class PluginGui : public AudioProcessorEditor, +class PluginGui : public Component, public FileDragAndDropTarget, public DragAndDropContainer, public Timer, @@ -44,7 +44,7 @@ class PluginGui : public AudioProcessorEditor, public: //============================================================================== PluginGui (AdlibBlasterAudioProcessor* ownerFilter); - ~PluginGui(); + ~PluginGui() override; //============================================================================== //[UserMethods] -- You can add your own custom methods in this section. @@ -304,3 +304,4 @@ private: //[EndFile] You can add extra defines here... //[/EndFile] + diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp index 116ffb1..b879f6d 100644 --- a/Source/PluginProcessor.cpp +++ b/Source/PluginProcessor.cpp @@ -1,5 +1,5 @@ #include "PluginProcessor.h" -#include "PluginGui.h" +#include "PluginEditor.h" #include "EnumFloatParameter.h" #include "IntFloatParameter.h" #include "SbiLoader.h" @@ -671,10 +671,10 @@ int AdlibBlasterAudioProcessor::getCurrentProgram() void AdlibBlasterAudioProcessor::updateGuiIfPresent() { - PluginGui* gui = (PluginGui*)getActiveEditor(); - if (gui) { - gui->updateFromParameters(); - } + PluginEditor* gui = (PluginEditor*)getActiveEditor(); + if (gui) { + gui->updateFromParameters(); + } } void AdlibBlasterAudioProcessor::setCurrentProgram (int index) @@ -831,7 +831,7 @@ bool AdlibBlasterAudioProcessor::hasEditor() const AudioProcessorEditor* AdlibBlasterAudioProcessor::createEditor() { - PluginGui* gui = new PluginGui(this); + PluginEditor* gui = new PluginEditor(this); gui->updateFromParameters(); return gui; }