mirrors/OPL
2
0
Fork 0
Code Activity

Bug fixes and visual tweaks.

Browse source
This commit is contained in:
bsutherland 2017-03-04 12:44:56 +09:00
parent af5580ca63
commit 7d4af8c78d
7 changed files with 61 additions and 80 deletions

57
JuceOPLVSTi.jucer
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<JUCERPROJECT id="wUKQiT" name="JuceOPLVSTi" projectType="audioplug" version="0.14.1" <JUCERPROJECT id="wUKQiT" name="JuceOPLVSTi" projectType="audioplug" version="0.14.2"
bundleIdentifier="com.plainweave.JuceOPLVSTi" buildVST="1" buildAU="1" bundleIdentifier="com.plainweave.JuceOPLVSTi" buildVST="1" buildAU="1"
pluginName="JuceOPLVSTi" pluginDesc="JuceOPLVSTi" pluginManufacturer="Plainweave Software" pluginName="JuceOPLVSTi" pluginDesc="JuceOPLVSTi" pluginManufacturer="Plainweave Software"
pluginManufacturerCode="Pwve" pluginCode="JOPL" pluginChannelConfigs="{0, 1}" pluginManufacturerCode="Pwve" pluginCode="JOPL" pluginChannelConfigs="{0, 1}"
@ -80,33 +80,6 @@
</MODULES> </MODULES>
<JUCEOPTIONS JUCE_QUICKTIME="disabled"/> <JUCEOPTIONS JUCE_QUICKTIME="disabled"/>
<EXPORTFORMATS> <EXPORTFORMATS>
<VS2013 targetFolder="Builds/VisualStudio2013" vstFolder="C:\code\audio\vstsdk2.4"
externalLibraries="" toolset="">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" winWarningLevel="4" generateManifest="1" winArchitecture="32-bit"
isDebug="1" optimisation="1" targetName="JuceOPLVSTi"/>
<CONFIGURATION name="Release - 64-bit" winWarningLevel="4" generateManifest="1"
winArchitecture="x64" isDebug="0" optimisation="3" targetName="JuceOPLVSTi"/>
<CONFIGURATION name="Release - 32-bit" winWarningLevel="4" generateManifest="1"
winArchitecture="32-bit" isDebug="0" optimisation="3" targetName="JuceOPLVSTi"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_audio_basics" path="..\Juce-grapefruit\JUCE\modules"/>
<MODULEPATH id="juce_audio_devices" path="..\Juce-grapefruit\JUCE\modules"/>
<MODULEPATH id="juce_audio_formats" path="..\Juce-grapefruit\JUCE\modules"/>
<MODULEPATH id="juce_audio_plugin_client" path="..\Juce-grapefruit\JUCE\modules"/>
<MODULEPATH id="juce_audio_processors" path="..\Juce-grapefruit\JUCE\modules"/>
<MODULEPATH id="juce_core" path="..\Juce-grapefruit\JUCE\modules"/>
<MODULEPATH id="juce_cryptography" path="..\Juce-grapefruit\JUCE\modules"/>
<MODULEPATH id="juce_data_structures" path="..\Juce-grapefruit\JUCE\modules"/>
<MODULEPATH id="juce_events" path="..\Juce-grapefruit\JUCE\modules"/>
<MODULEPATH id="juce_graphics" path="..\Juce-grapefruit\JUCE\modules"/>
<MODULEPATH id="juce_gui_basics" path="..\Juce-grapefruit\JUCE\modules"/>
<MODULEPATH id="juce_gui_extra" path="..\Juce-grapefruit\JUCE\modules"/>
<MODULEPATH id="juce_opengl" path="..\Juce-grapefruit\JUCE\modules"/>
<MODULEPATH id="juce_video" path="..\Juce-grapefruit\JUCE\modules"/>
</MODULEPATHS>
</VS2013>
<VS2015 targetFolder="Builds/VisualStudio2015" vstFolder="C:\code\audio\VST3 SDK" <VS2015 targetFolder="Builds/VisualStudio2015" vstFolder="C:\code\audio\VST3 SDK"
extraCompilerFlags="/wd4458" vst3Folder=""> extraCompilerFlags="/wd4458" vst3Folder="">
<CONFIGURATIONS> <CONFIGURATIONS>
@ -120,20 +93,20 @@
warningsAreErrors="1" headerPath=""/> warningsAreErrors="1" headerPath=""/>
</CONFIGURATIONS> </CONFIGURATIONS>
<MODULEPATHS> <MODULEPATHS>
<MODULEPATH id="juce_video" path="..\Juce-grapefruit\JUCE\modules"/> <MODULEPATH id="juce_video" path="..\Juce-grapefruit\JUCE\JUCE\modules"/>
<MODULEPATH id="juce_opengl" path="..\Juce-grapefruit\JUCE\modules"/> <MODULEPATH id="juce_opengl" path="..\Juce-grapefruit\JUCE\JUCE\modules"/>
<MODULEPATH id="juce_gui_extra" path="..\Juce-grapefruit\JUCE\modules"/> <MODULEPATH id="juce_gui_extra" path="..\Juce-grapefruit\JUCE\JUCE\modules"/>
<MODULEPATH id="juce_gui_basics" path="..\Juce-grapefruit\JUCE\modules"/> <MODULEPATH id="juce_gui_basics" path="..\Juce-grapefruit\JUCE\JUCE\modules"/>
<MODULEPATH id="juce_graphics" path="..\Juce-grapefruit\JUCE\modules"/> <MODULEPATH id="juce_graphics" path="..\Juce-grapefruit\JUCE\JUCE\modules"/>
<MODULEPATH id="juce_events" path="..\Juce-grapefruit\JUCE\modules"/> <MODULEPATH id="juce_events" path="..\Juce-grapefruit\JUCE\JUCE\modules"/>
<MODULEPATH id="juce_data_structures" path="..\Juce-grapefruit\JUCE\modules"/> <MODULEPATH id="juce_data_structures" path="..\Juce-grapefruit\JUCE\JUCE\modules"/>
<MODULEPATH id="juce_cryptography" path="..\Juce-grapefruit\JUCE\modules"/> <MODULEPATH id="juce_cryptography" path="..\Juce-grapefruit\JUCE\JUCE\modules"/>
<MODULEPATH id="juce_core" path="..\Juce-grapefruit\JUCE\modules"/> <MODULEPATH id="juce_core" path="..\Juce-grapefruit\JUCE\JUCE\modules"/>
<MODULEPATH id="juce_audio_processors" path="..\Juce-grapefruit\JUCE\modules"/> <MODULEPATH id="juce_audio_processors" path="..\Juce-grapefruit\JUCE\JUCE\modules"/>
<MODULEPATH id="juce_audio_plugin_client" path="..\Juce-grapefruit\JUCE\modules"/> <MODULEPATH id="juce_audio_plugin_client" path="..\Juce-grapefruit\JUCE\JUCE\modules"/>
<MODULEPATH id="juce_audio_formats" path="..\Juce-grapefruit\JUCE\modules"/> <MODULEPATH id="juce_audio_formats" path="..\Juce-grapefruit\JUCE\JUCE\modules"/>
<MODULEPATH id="juce_audio_devices" path="..\Juce-grapefruit\JUCE\modules"/> <MODULEPATH id="juce_audio_devices" path="..\Juce-grapefruit\JUCE\JUCE\modules"/>
<MODULEPATH id="juce_audio_basics" path="..\Juce-grapefruit\JUCE\modules"/> <MODULEPATH id="juce_audio_basics" path="..\Juce-grapefruit\JUCE\JUCE\modules"/>
</MODULEPATHS> </MODULEPATHS>
</VS2015> </VS2015>
</EXPORTFORMATS> </EXPORTFORMATS>

4
Source/OPLLookAndFeel.cpp
View file

@ -17,7 +17,9 @@ OPLLookAndFeel::OPLLookAndFeel()
toggleOn = ImageCache::getFromMemory(PluginGui::toggle_on_sq_png, PluginGui::toggle_on_sq_pngSize), 1.000f, Colour(0x00000000); toggleOn = ImageCache::getFromMemory(PluginGui::toggle_on_sq_png, PluginGui::toggle_on_sq_pngSize), 1.000f, Colour(0x00000000);
toggleRect = Rectangle<float>((float)toggleOff.getWidth(), (float)toggleOn.getHeight()); toggleRect = Rectangle<float>((float)toggleOff.getWidth(), (float)toggleOn.getHeight());
setColour(Label::ColourIds::outlineWhenEditingColourId, Colours::black); // Prevents an ugly white border from being drawn around a component with keyboard focus.
setColour(TextEditor::ColourIds::focusedOutlineColourId, Colours::black);
setColour(Slider::ColourIds::textBoxOutlineColourId, Colour(0xff007f00));
} }
void OPLLookAndFeel::drawTickBox(Graphics &g, void OPLLookAndFeel::drawTickBox(Graphics &g,

70
Source/PluginGui.cpp
View file

@ -7,7 +7,7 @@
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
and re-saved. and re-saved.
Created with Projucer version: 4.2.4 Created with Projucer version: 4.3.1
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
@ -102,15 +102,15 @@ void PluginGui::updateFromParameters()
sendNotificationAsync); sendNotificationAsync);
if (processor->getEnumParameter("Modulator Tremolo")) tremoloButton->setToggleState(true, dontSendNotification); tremoloButton->setToggleState(processor->getBoolParameter("Modulator Tremolo"), dontSendNotification);
if (processor->getEnumParameter("Modulator Vibrato")) vibratoButton->setToggleState(true, dontSendNotification); vibratoButton->setToggleState(processor->getBoolParameter("Modulator Vibrato"), dontSendNotification);
if (processor->getEnumParameter("Modulator Sustain")) sustainButton->setToggleState(true, dontSendNotification); sustainButton->setToggleState(processor->getBoolParameter("Modulator Sustain"), dontSendNotification);
if (processor->getEnumParameter("Modulator Keyscale Rate")) keyscaleEnvButton->setToggleState(true, dontSendNotification); keyscaleEnvButton->setToggleState(processor->getBoolParameter("Modulator Keyscale Rate"), dontSendNotification);
if (processor->getEnumParameter("Carrier Tremolo")) tremoloButton2->setToggleState(true, dontSendNotification); tremoloButton2->setToggleState(processor->getBoolParameter("Carrier Tremolo"), dontSendNotification);
if (processor->getEnumParameter("Carrier Vibrato")) vibratoButton2->setToggleState(true, dontSendNotification); vibratoButton2->setToggleState(processor->getBoolParameter("Carrier Vibrato"), dontSendNotification);
if (processor->getEnumParameter("Carrier Sustain")) sustainButton2->setToggleState(true, dontSendNotification); sustainButton2->setToggleState(processor->getBoolParameter("Carrier Sustain"), dontSendNotification);
if (processor->getEnumParameter("Carrier Keyscale Rate")) keyscaleEnvButton2->setToggleState(true, dontSendNotification); keyscaleEnvButton2->setToggleState(processor->getBoolParameter("Carrier Keyscale Rate"), dontSendNotification);
vibratoSlider->setValue(processor->getEnumParameter("Vibrato Depth") * 7.0 + 7.0, juce::NotificationType::dontSendNotification); vibratoSlider->setValue(processor->getEnumParameter("Vibrato Depth") * 7.0 + 7.0, juce::NotificationType::dontSendNotification);
tremoloSlider->setValue(processor->getEnumParameter("Tremolo Depth") * 3.8 + 1.0, juce::NotificationType::dontSendNotification); tremoloSlider->setValue(processor->getEnumParameter("Tremolo Depth") * 3.8 + 1.0, juce::NotificationType::dontSendNotification);
@ -183,7 +183,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter)
aSlider->setTooltip (TRANS("Envelope attack rate")); aSlider->setTooltip (TRANS("Envelope attack rate"));
aSlider->setRange (0, 15, 1); aSlider->setRange (0, 15, 1);
aSlider->setSliderStyle (Slider::LinearVertical); aSlider->setSliderStyle (Slider::LinearVertical);
aSlider->setTextBoxStyle (Slider::TextBoxBelow, false, 30, 20); aSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 30, 20);
aSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); aSlider->setColour (Slider::thumbColourId, Colour (0xff00af00));
aSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); aSlider->setColour (Slider::trackColourId, Colour (0x7f007f00));
aSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); aSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00));
@ -205,7 +205,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter)
dSlider->setTooltip (TRANS("Envelope decay rate")); dSlider->setTooltip (TRANS("Envelope decay rate"));
dSlider->setRange (0, 15, 1); dSlider->setRange (0, 15, 1);
dSlider->setSliderStyle (Slider::LinearVertical); dSlider->setSliderStyle (Slider::LinearVertical);
dSlider->setTextBoxStyle (Slider::TextBoxBelow, false, 30, 20); dSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 30, 20);
dSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); dSlider->setColour (Slider::thumbColourId, Colour (0xff00af00));
dSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); dSlider->setColour (Slider::trackColourId, Colour (0x7f007f00));
dSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); dSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00));
@ -227,7 +227,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter)
sSlider->setTooltip (TRANS("Envelope sustain level")); sSlider->setTooltip (TRANS("Envelope sustain level"));
sSlider->setRange (0, 15, 1); sSlider->setRange (0, 15, 1);
sSlider->setSliderStyle (Slider::LinearVertical); sSlider->setSliderStyle (Slider::LinearVertical);
sSlider->setTextBoxStyle (Slider::TextBoxBelow, false, 30, 20); sSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 30, 20);
sSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); sSlider->setColour (Slider::thumbColourId, Colour (0xff00af00));
sSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); sSlider->setColour (Slider::trackColourId, Colour (0x7f007f00));
sSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); sSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00));
@ -249,7 +249,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter)
rSlider->setTooltip (TRANS("Envelope release rate")); rSlider->setTooltip (TRANS("Envelope release rate"));
rSlider->setRange (0, 15, 1); rSlider->setRange (0, 15, 1);
rSlider->setSliderStyle (Slider::LinearVertical); rSlider->setSliderStyle (Slider::LinearVertical);
rSlider->setTextBoxStyle (Slider::TextBoxBelow, false, 30, 20); rSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 30, 20);
rSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); rSlider->setColour (Slider::thumbColourId, Colour (0xff00af00));
rSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); rSlider->setColour (Slider::trackColourId, Colour (0x7f007f00));
rSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); rSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00));
@ -270,7 +270,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter)
addAndMakeVisible (attenuationSlider = new Slider ("attenuation slider")); addAndMakeVisible (attenuationSlider = new Slider ("attenuation slider"));
attenuationSlider->setRange (-47.25, 0, 0.75); attenuationSlider->setRange (-47.25, 0, 0.75);
attenuationSlider->setSliderStyle (Slider::LinearHorizontal); attenuationSlider->setSliderStyle (Slider::LinearHorizontal);
attenuationSlider->setTextBoxStyle (Slider::TextBoxRight, false, 64, 20); attenuationSlider->setTextBoxStyle (Slider::TextBoxRight, true, 64, 20);
attenuationSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); attenuationSlider->setColour (Slider::thumbColourId, Colour (0xff00af00));
attenuationSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); attenuationSlider->setColour (Slider::trackColourId, Colour (0x7f007f00));
attenuationSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); attenuationSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00));
@ -403,7 +403,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter)
addAndMakeVisible (aSlider2 = new Slider ("a slider")); addAndMakeVisible (aSlider2 = new Slider ("a slider"));
aSlider2->setRange (0, 15, 1); aSlider2->setRange (0, 15, 1);
aSlider2->setSliderStyle (Slider::LinearVertical); aSlider2->setSliderStyle (Slider::LinearVertical);
aSlider2->setTextBoxStyle (Slider::TextBoxBelow, false, 40, 20); aSlider2->setTextBoxStyle (Slider::TextBoxBelow, true, 40, 20);
aSlider2->setColour (Slider::thumbColourId, Colour (0xff00af00)); aSlider2->setColour (Slider::thumbColourId, Colour (0xff00af00));
aSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00)); aSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00));
aSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); aSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00));
@ -424,7 +424,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter)
addAndMakeVisible (dSlider2 = new Slider ("d slider")); addAndMakeVisible (dSlider2 = new Slider ("d slider"));
dSlider2->setRange (0, 15, 1); dSlider2->setRange (0, 15, 1);
dSlider2->setSliderStyle (Slider::LinearVertical); dSlider2->setSliderStyle (Slider::LinearVertical);
dSlider2->setTextBoxStyle (Slider::TextBoxBelow, false, 40, 20); dSlider2->setTextBoxStyle (Slider::TextBoxBelow, true, 40, 20);
dSlider2->setColour (Slider::thumbColourId, Colour (0xff00af00)); dSlider2->setColour (Slider::thumbColourId, Colour (0xff00af00));
dSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00)); dSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00));
dSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); dSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00));
@ -445,7 +445,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter)
addAndMakeVisible (sSlider2 = new Slider ("s slider")); addAndMakeVisible (sSlider2 = new Slider ("s slider"));
sSlider2->setRange (0, 15, 1); sSlider2->setRange (0, 15, 1);
sSlider2->setSliderStyle (Slider::LinearVertical); sSlider2->setSliderStyle (Slider::LinearVertical);
sSlider2->setTextBoxStyle (Slider::TextBoxBelow, false, 40, 20); sSlider2->setTextBoxStyle (Slider::TextBoxBelow, true, 40, 20);
sSlider2->setColour (Slider::thumbColourId, Colour (0xff00af00)); sSlider2->setColour (Slider::thumbColourId, Colour (0xff00af00));
sSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00)); sSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00));
sSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); sSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00));
@ -466,7 +466,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter)
addAndMakeVisible (rSlider2 = new Slider ("r slider")); addAndMakeVisible (rSlider2 = new Slider ("r slider"));
rSlider2->setRange (0, 15, 1); rSlider2->setRange (0, 15, 1);
rSlider2->setSliderStyle (Slider::LinearVertical); rSlider2->setSliderStyle (Slider::LinearVertical);
rSlider2->setTextBoxStyle (Slider::TextBoxBelow, false, 40, 20); rSlider2->setTextBoxStyle (Slider::TextBoxBelow, true, 40, 20);
rSlider2->setColour (Slider::thumbColourId, Colour (0xff00af00)); rSlider2->setColour (Slider::thumbColourId, Colour (0xff00af00));
rSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00)); rSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00));
rSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); rSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00));
@ -487,7 +487,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter)
addAndMakeVisible (attenuationSlider2 = new Slider ("attenuation slider")); addAndMakeVisible (attenuationSlider2 = new Slider ("attenuation slider"));
attenuationSlider2->setRange (-47.25, 0, 0.75); attenuationSlider2->setRange (-47.25, 0, 0.75);
attenuationSlider2->setSliderStyle (Slider::LinearHorizontal); attenuationSlider2->setSliderStyle (Slider::LinearHorizontal);
attenuationSlider2->setTextBoxStyle (Slider::TextBoxRight, false, 64, 20); attenuationSlider2->setTextBoxStyle (Slider::TextBoxRight, true, 64, 20);
attenuationSlider2->setColour (Slider::thumbColourId, Colour (0xff00af00)); attenuationSlider2->setColour (Slider::thumbColourId, Colour (0xff00af00));
attenuationSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00)); attenuationSlider2->setColour (Slider::trackColourId, Colour (0x7f007f00));
attenuationSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); attenuationSlider2->setColour (Slider::textBoxTextColourId, Colour (0xff007f00));
@ -603,7 +603,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter)
addAndMakeVisible (tremoloSlider = new Slider ("tremolo slider")); addAndMakeVisible (tremoloSlider = new Slider ("tremolo slider"));
tremoloSlider->setRange (1, 4.8, 3.8); tremoloSlider->setRange (1, 4.8, 3.8);
tremoloSlider->setSliderStyle (Slider::LinearHorizontal); tremoloSlider->setSliderStyle (Slider::LinearHorizontal);
tremoloSlider->setTextBoxStyle (Slider::TextBoxRight, false, 32, 20); tremoloSlider->setTextBoxStyle (Slider::TextBoxRight, true, 32, 20);
tremoloSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); tremoloSlider->setColour (Slider::thumbColourId, Colour (0xff00af00));
tremoloSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); tremoloSlider->setColour (Slider::trackColourId, Colour (0x7f007f00));
tremoloSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); tremoloSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00));
@ -634,7 +634,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter)
addAndMakeVisible (vibratoSlider = new Slider ("vibrato slider")); addAndMakeVisible (vibratoSlider = new Slider ("vibrato slider"));
vibratoSlider->setRange (7, 14, 7); vibratoSlider->setRange (7, 14, 7);
vibratoSlider->setSliderStyle (Slider::LinearHorizontal); vibratoSlider->setSliderStyle (Slider::LinearHorizontal);
vibratoSlider->setTextBoxStyle (Slider::TextBoxRight, false, 32, 20); vibratoSlider->setTextBoxStyle (Slider::TextBoxRight, true, 32, 20);
vibratoSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); vibratoSlider->setColour (Slider::thumbColourId, Colour (0xff00af00));
vibratoSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); vibratoSlider->setColour (Slider::trackColourId, Colour (0x7f007f00));
vibratoSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); vibratoSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00));
@ -666,7 +666,7 @@ PluginGui::PluginGui (AdlibBlasterAudioProcessor* ownerFilter)
addAndMakeVisible (feedbackSlider = new Slider ("feedback slider")); addAndMakeVisible (feedbackSlider = new Slider ("feedback slider"));
feedbackSlider->setRange (0, 7, 1); feedbackSlider->setRange (0, 7, 1);
feedbackSlider->setSliderStyle (Slider::LinearVertical); feedbackSlider->setSliderStyle (Slider::LinearVertical);
feedbackSlider->setTextBoxStyle (Slider::TextBoxBelow, false, 30, 20); feedbackSlider->setTextBoxStyle (Slider::TextBoxBelow, true, 30, 20);
feedbackSlider->setColour (Slider::thumbColourId, Colour (0xff00af00)); feedbackSlider->setColour (Slider::thumbColourId, Colour (0xff00af00));
feedbackSlider->setColour (Slider::trackColourId, Colour (0x7f007f00)); feedbackSlider->setColour (Slider::trackColourId, Colour (0x7f007f00));
feedbackSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00)); feedbackSlider->setColour (Slider::textBoxTextColourId, Colour (0xff007f00));
@ -2489,7 +2489,7 @@ BEGIN_JUCER_METADATA
explicitFocusOrder="0" pos="30 203 30 88" tooltip="Envelope attack rate" explicitFocusOrder="0" pos="30 203 30 88" tooltip="Envelope attack rate"
thumbcol="ff00af00" trackcol="7f007f00" textboxtext="ff007f00" thumbcol="ff00af00" trackcol="7f007f00" textboxtext="ff007f00"
textboxbkgd="ff000000" textboxhighlight="ff00af00" min="0" max="15" textboxbkgd="ff000000" textboxhighlight="ff00af00" min="0" max="15"
int="1" style="LinearVertical" textBoxPos="TextBoxBelow" textBoxEditable="1" int="1" style="LinearVertical" textBoxPos="TextBoxBelow" textBoxEditable="0"
textBoxWidth="30" textBoxHeight="20" skewFactor="1" needsCallback="1"/> textBoxWidth="30" textBoxHeight="20" skewFactor="1" needsCallback="1"/>
<LABEL name="a label" id="9dd0b13f00b4de42" memberName="aLabel" virtualName="" <LABEL name="a label" id="9dd0b13f00b4de42" memberName="aLabel" virtualName=""
explicitFocusOrder="0" pos="30 293 30 24" tooltip="Attack rate" explicitFocusOrder="0" pos="30 293 30 24" tooltip="Attack rate"
@ -2500,7 +2500,7 @@ BEGIN_JUCER_METADATA
explicitFocusOrder="0" pos="70 203 30 88" tooltip="Envelope decay rate" explicitFocusOrder="0" pos="70 203 30 88" tooltip="Envelope decay rate"
thumbcol="ff00af00" trackcol="7f007f00" textboxtext="ff007f00" thumbcol="ff00af00" trackcol="7f007f00" textboxtext="ff007f00"
textboxbkgd="ff000000" textboxhighlight="ff00af00" min="0" max="15" textboxbkgd="ff000000" textboxhighlight="ff00af00" min="0" max="15"
int="1" style="LinearVertical" textBoxPos="TextBoxBelow" textBoxEditable="1" int="1" style="LinearVertical" textBoxPos="TextBoxBelow" textBoxEditable="0"
textBoxWidth="30" textBoxHeight="20" skewFactor="1" needsCallback="1"/> textBoxWidth="30" textBoxHeight="20" skewFactor="1" needsCallback="1"/>
<LABEL name="d label" id="a7f17b098b85f10b" memberName="dLabel" virtualName="" <LABEL name="d label" id="a7f17b098b85f10b" memberName="dLabel" virtualName=""
explicitFocusOrder="0" pos="70 293 30 24" tooltip="Decay rate" explicitFocusOrder="0" pos="70 293 30 24" tooltip="Decay rate"
@ -2511,7 +2511,7 @@ BEGIN_JUCER_METADATA
explicitFocusOrder="0" pos="110 203 30 88" tooltip="Envelope sustain level" explicitFocusOrder="0" pos="110 203 30 88" tooltip="Envelope sustain level"
thumbcol="ff00af00" trackcol="7f007f00" textboxtext="ff007f00" thumbcol="ff00af00" trackcol="7f007f00" textboxtext="ff007f00"
textboxbkgd="ff000000" textboxhighlight="ff00af00" min="0" max="15" textboxbkgd="ff000000" textboxhighlight="ff00af00" min="0" max="15"
int="1" style="LinearVertical" textBoxPos="TextBoxBelow" textBoxEditable="1" int="1" style="LinearVertical" textBoxPos="TextBoxBelow" textBoxEditable="0"
textBoxWidth="30" textBoxHeight="20" skewFactor="1" needsCallback="1"/> textBoxWidth="30" textBoxHeight="20" skewFactor="1" needsCallback="1"/>
<LABEL name="d label" id="6467455c7573fefa" memberName="dLabel2" virtualName="" <LABEL name="d label" id="6467455c7573fefa" memberName="dLabel2" virtualName=""
explicitFocusOrder="0" pos="110 293 30 24" tooltip="Sustain level" explicitFocusOrder="0" pos="110 293 30 24" tooltip="Sustain level"
@ -2522,7 +2522,7 @@ BEGIN_JUCER_METADATA
explicitFocusOrder="0" pos="150 203 30 88" tooltip="Envelope release rate" explicitFocusOrder="0" pos="150 203 30 88" tooltip="Envelope release rate"
thumbcol="ff00af00" trackcol="7f007f00" textboxtext="ff007f00" thumbcol="ff00af00" trackcol="7f007f00" textboxtext="ff007f00"
textboxbkgd="ff000000" textboxhighlight="ff00af00" min="0" max="15" textboxbkgd="ff000000" textboxhighlight="ff00af00" min="0" max="15"
int="1" style="LinearVertical" textBoxPos="TextBoxBelow" textBoxEditable="1" int="1" style="LinearVertical" textBoxPos="TextBoxBelow" textBoxEditable="0"
textBoxWidth="30" textBoxHeight="20" skewFactor="1" needsCallback="1"/> textBoxWidth="30" textBoxHeight="20" skewFactor="1" needsCallback="1"/>
<LABEL name="r label" id="ef30d2907e867666" memberName="rLabel" virtualName="" <LABEL name="r label" id="ef30d2907e867666" memberName="rLabel" virtualName=""
explicitFocusOrder="0" pos="150 293 30 24" tooltip="Release rate" explicitFocusOrder="0" pos="150 293 30 24" tooltip="Release rate"
@ -2533,7 +2533,7 @@ BEGIN_JUCER_METADATA
virtualName="" explicitFocusOrder="0" pos="130 350 232 24" thumbcol="ff00af00" virtualName="" explicitFocusOrder="0" pos="130 350 232 24" thumbcol="ff00af00"
trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000" trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000"
textboxhighlight="ff00af00" min="-47.25" max="0" int="0.75" style="LinearHorizontal" textboxhighlight="ff00af00" min="-47.25" max="0" int="0.75" style="LinearHorizontal"
textBoxPos="TextBoxRight" textBoxEditable="1" textBoxWidth="64" textBoxPos="TextBoxRight" textBoxEditable="0" textBoxWidth="64"
textBoxHeight="20" skewFactor="1" needsCallback="1"/> textBoxHeight="20" skewFactor="1" needsCallback="1"/>
<LABEL name="attenuation label" id="643f88854c82ca3e" memberName="attenuationLabel" <LABEL name="attenuation label" id="643f88854c82ca3e" memberName="attenuationLabel"
virtualName="" explicitFocusOrder="0" pos="32 350 106 24" tooltip="Final output level adjustment" virtualName="" explicitFocusOrder="0" pos="32 350 106 24" tooltip="Final output level adjustment"
@ -2610,7 +2610,7 @@ BEGIN_JUCER_METADATA
explicitFocusOrder="0" pos="462 203 30 88" thumbcol="ff00af00" explicitFocusOrder="0" pos="462 203 30 88" thumbcol="ff00af00"
trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000" trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000"
textboxhighlight="ff00af00" min="0" max="15" int="1" style="LinearVertical" textboxhighlight="ff00af00" min="0" max="15" int="1" style="LinearVertical"
textBoxPos="TextBoxBelow" textBoxEditable="1" textBoxWidth="40" textBoxPos="TextBoxBelow" textBoxEditable="0" textBoxWidth="40"
textBoxHeight="20" skewFactor="1" needsCallback="1"/> textBoxHeight="20" skewFactor="1" needsCallback="1"/>
<LABEL name="a label" id="9ec6412cc79720bc" memberName="aLabel2" virtualName="" <LABEL name="a label" id="9ec6412cc79720bc" memberName="aLabel2" virtualName=""
explicitFocusOrder="0" pos="462 293 30 24" tooltip="Attack rate" explicitFocusOrder="0" pos="462 293 30 24" tooltip="Attack rate"
@ -2621,7 +2621,7 @@ BEGIN_JUCER_METADATA
explicitFocusOrder="0" pos="510 203 30 88" thumbcol="ff00af00" explicitFocusOrder="0" pos="510 203 30 88" thumbcol="ff00af00"
trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000" trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000"
textboxhighlight="ff00af00" min="0" max="15" int="1" style="LinearVertical" textboxhighlight="ff00af00" min="0" max="15" int="1" style="LinearVertical"
textBoxPos="TextBoxBelow" textBoxEditable="1" textBoxWidth="40" textBoxPos="TextBoxBelow" textBoxEditable="0" textBoxWidth="40"
textBoxHeight="20" skewFactor="1" needsCallback="1"/> textBoxHeight="20" skewFactor="1" needsCallback="1"/>
<LABEL name="d label" id="10231adaf9e23e14" memberName="dLabel3" virtualName="" <LABEL name="d label" id="10231adaf9e23e14" memberName="dLabel3" virtualName=""
explicitFocusOrder="0" pos="510 293 30 24" tooltip="Decay rate" explicitFocusOrder="0" pos="510 293 30 24" tooltip="Decay rate"
@ -2632,7 +2632,7 @@ BEGIN_JUCER_METADATA
explicitFocusOrder="0" pos="558 203 30 88" thumbcol="ff00af00" explicitFocusOrder="0" pos="558 203 30 88" thumbcol="ff00af00"
trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000" trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000"
textboxhighlight="ff00af00" min="0" max="15" int="1" style="LinearVertical" textboxhighlight="ff00af00" min="0" max="15" int="1" style="LinearVertical"
textBoxPos="TextBoxBelow" textBoxEditable="1" textBoxWidth="40" textBoxPos="TextBoxBelow" textBoxEditable="0" textBoxWidth="40"
textBoxHeight="20" skewFactor="1" needsCallback="1"/> textBoxHeight="20" skewFactor="1" needsCallback="1"/>
<LABEL name="d label" id="5b881f2381defac" memberName="dLabel4" virtualName="" <LABEL name="d label" id="5b881f2381defac" memberName="dLabel4" virtualName=""
explicitFocusOrder="0" pos="558 293 30 24" tooltip="Sustain level" explicitFocusOrder="0" pos="558 293 30 24" tooltip="Sustain level"
@ -2643,7 +2643,7 @@ BEGIN_JUCER_METADATA
explicitFocusOrder="0" pos="606 203 30 88" thumbcol="ff00af00" explicitFocusOrder="0" pos="606 203 30 88" thumbcol="ff00af00"
trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000" trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000"
textboxhighlight="ff00af00" min="0" max="15" int="1" style="LinearVertical" textboxhighlight="ff00af00" min="0" max="15" int="1" style="LinearVertical"
textBoxPos="TextBoxBelow" textBoxEditable="1" textBoxWidth="40" textBoxPos="TextBoxBelow" textBoxEditable="0" textBoxWidth="40"
textBoxHeight="20" skewFactor="1" needsCallback="1"/> textBoxHeight="20" skewFactor="1" needsCallback="1"/>
<LABEL name="r label" id="ca2834438bee82a9" memberName="rLabel2" virtualName="" <LABEL name="r label" id="ca2834438bee82a9" memberName="rLabel2" virtualName=""
explicitFocusOrder="0" pos="606 293 30 24" tooltip="Release rate" explicitFocusOrder="0" pos="606 293 30 24" tooltip="Release rate"
@ -2654,7 +2654,7 @@ BEGIN_JUCER_METADATA
virtualName="" explicitFocusOrder="0" pos="554 350 232 24" thumbcol="ff00af00" virtualName="" explicitFocusOrder="0" pos="554 350 232 24" thumbcol="ff00af00"
trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000" trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000"
textboxhighlight="ff00af00" min="-47.25" max="0" int="0.75" style="LinearHorizontal" textboxhighlight="ff00af00" min="-47.25" max="0" int="0.75" style="LinearHorizontal"
textBoxPos="TextBoxRight" textBoxEditable="1" textBoxWidth="64" textBoxPos="TextBoxRight" textBoxEditable="0" textBoxWidth="64"
textBoxHeight="20" skewFactor="1" needsCallback="1"/> textBoxHeight="20" skewFactor="1" needsCallback="1"/>
<LABEL name="attenuation label" id="958314f88253f461" memberName="attenuationLabel2" <LABEL name="attenuation label" id="958314f88253f461" memberName="attenuationLabel2"
virtualName="" explicitFocusOrder="0" pos="456 350 106 24" tooltip="Final output level adjustment" virtualName="" explicitFocusOrder="0" pos="456 350 106 24" tooltip="Final output level adjustment"
@ -2724,7 +2724,7 @@ BEGIN_JUCER_METADATA
trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000" trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000"
textboxhighlight="ff00af00" min="1" max="4.7999999999999998224" textboxhighlight="ff00af00" min="1" max="4.7999999999999998224"
int="3.7999999999999998224" style="LinearHorizontal" textBoxPos="TextBoxRight" int="3.7999999999999998224" style="LinearHorizontal" textBoxPos="TextBoxRight"
textBoxEditable="1" textBoxWidth="32" textBoxHeight="20" skewFactor="1" textBoxEditable="0" textBoxWidth="32" textBoxHeight="20" skewFactor="1"
needsCallback="1"/> needsCallback="1"/>
<LABEL name="frequency label" id="134ce8f87da62b88" memberName="frequencyLabel5" <LABEL name="frequency label" id="134ce8f87da62b88" memberName="frequencyLabel5"
virtualName="" explicitFocusOrder="0" pos="40 424 104 24" tooltip="OPL global tremolo depth" virtualName="" explicitFocusOrder="0" pos="40 424 104 24" tooltip="OPL global tremolo depth"
@ -2740,7 +2740,7 @@ BEGIN_JUCER_METADATA
virtualName="" explicitFocusOrder="0" pos="149 456 80 24" thumbcol="ff00af00" virtualName="" explicitFocusOrder="0" pos="149 456 80 24" thumbcol="ff00af00"
trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000" trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000"
textboxhighlight="ff00af00" min="7" max="14" int="7" style="LinearHorizontal" textboxhighlight="ff00af00" min="7" max="14" int="7" style="LinearHorizontal"
textBoxPos="TextBoxRight" textBoxEditable="1" textBoxWidth="32" textBoxPos="TextBoxRight" textBoxEditable="0" textBoxWidth="32"
textBoxHeight="20" skewFactor="1" needsCallback="1"/> textBoxHeight="20" skewFactor="1" needsCallback="1"/>
<LABEL name="frequency label" id="1412b9d14e37bcbe" memberName="frequencyLabel6" <LABEL name="frequency label" id="1412b9d14e37bcbe" memberName="frequencyLabel6"
virtualName="" explicitFocusOrder="0" pos="40 456 96 24" tooltip="OPL global vibrato depth" virtualName="" explicitFocusOrder="0" pos="40 456 96 24" tooltip="OPL global vibrato depth"
@ -2757,7 +2757,7 @@ BEGIN_JUCER_METADATA
virtualName="" explicitFocusOrder="0" pos="190 203 30 88" thumbcol="ff00af00" virtualName="" explicitFocusOrder="0" pos="190 203 30 88" thumbcol="ff00af00"
trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000" trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000"
textboxhighlight="ff00af00" min="0" max="7" int="1" style="LinearVertical" textboxhighlight="ff00af00" min="0" max="7" int="1" style="LinearVertical"
textBoxPos="TextBoxBelow" textBoxEditable="1" textBoxWidth="30" textBoxPos="TextBoxBelow" textBoxEditable="0" textBoxWidth="30"
textBoxHeight="20" skewFactor="1" needsCallback="1"/> textBoxHeight="20" skewFactor="1" needsCallback="1"/>
<LABEL name="frequency label" id="880eaf14af62578a" memberName="frequencyLabel7" <LABEL name="frequency label" id="880eaf14af62578a" memberName="frequencyLabel7"
virtualName="" explicitFocusOrder="0" pos="190 293 30 24" tooltip="Extent to which modulator output is fed back into itself" virtualName="" explicitFocusOrder="0" pos="190 293 30 24" tooltip="Extent to which modulator output is fed back into itself"

2
Source/PluginGui.h
View file

@ -7,7 +7,7 @@
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
and re-saved. and re-saved.
Created with Projucer version: 4.2.4 Created with Projucer version: 4.3.1
------------------------------------------------------------------------------ ------------------------------------------------------------------------------

5
Source/PluginProcessor.cpp
View file

@ -475,6 +475,11 @@ int AdlibBlasterAudioProcessor::getEnumParameter (String name)
return p->getParameterIndex(); return p->getParameterIndex();
} }
bool AdlibBlasterAudioProcessor::getBoolParameter(String name)
{
return 0 != getEnumParameter(name);
}
// Parameters which apply directly to the OPL // Parameters which apply directly to the OPL
void AdlibBlasterAudioProcessor::setParameter (int index, float newValue) void AdlibBlasterAudioProcessor::setParameter (int index, float newValue)
{ {

1
Source/PluginProcessor.h
View file

@ -50,6 +50,7 @@ public:
void setIntParameter (String name, int newValue); void setIntParameter (String name, int newValue);
int getIntParameter (String name); int getIntParameter (String name);
int getEnumParameter (String name); int getEnumParameter (String name);
bool getBoolParameter(String name);
void loadInstrumentFromFile(String filename); void loadInstrumentFromFile(String filename);
void saveInstrumentToFile(String filename); void saveInstrumentToFile(String filename);
void setParametersByRegister(int register_base, int op, uint8 value); void setParametersByRegister(int register_base, int op, uint8 value);

2
Source/hiopl.cpp
View file

@ -181,7 +181,7 @@ void Hiopl::EnableAdditiveSynthesis(int ch, bool enable) {
void Hiopl::SetModulatorFeedback(int ch, int level) { void Hiopl::SetModulatorFeedback(int ch, int level) {
int offset = this->_GetOffset(ch); int offset = this->_GetOffset(ch);
_WriteReg(0xc0+offset, (Bit8u)level, 0x0e); _WriteReg(0xc0+offset, (Bit8u)level << 1, 0x0e);
} }
void Hiopl::SetPercussionMode(bool enable) { void Hiopl::SetPercussionMode(bool enable) {