From d1d6a8a200083cb9189a3c19180136aed7c332fe Mon Sep 17 00:00:00 2001 From: George Reales Date: Sun, 19 Apr 2020 15:43:40 +0200 Subject: [PATCH] 2.0 update Parameter code refactor. Fixed macOS Standalone window code. Updated jucer project. --- .gitignore | 1 + .../Standalone/juce_StandaloneFilterWindow.h | 176 ++-- OB-Xd.jucer | 172 ++-- Source/Gui/ButtonList.h | 69 +- Source/Gui/Knob.h | 56 +- Source/Gui/TooglableButton.h | 78 +- Source/PluginEditor.cpp | 785 ++++++--------- Source/PluginEditor.h | 56 +- Source/PluginProcessor.cpp | 947 +++++++++--------- Source/PluginProcessor.h | 81 +- 10 files changed, 1195 insertions(+), 1226 deletions(-) mode change 100644 => 100755 Modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h diff --git a/.gitignore b/.gitignore index af48007..a2443c8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ .DS_Store Builds/ +Modules/ ## JUCE library code JuceLibraryCode/ diff --git a/Modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h b/Modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h old mode 100644 new mode 100755 index ba2afb1..c91f2e0 --- a/Modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h +++ b/Modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h @@ -42,8 +42,7 @@ namespace juce @tags{Audio} */ class StandalonePluginHolder : private AudioIODeviceCallback, - private Timer, - private Value::Listener + private Timer { public: //============================================================================== @@ -73,17 +72,15 @@ public: #if JUCE_ANDROID || JUCE_IOS bool shouldAutoOpenMidiDevices = true #else - bool shouldAutoOpenMidiDevices = true + bool shouldAutoOpenMidiDevices = false #endif ) : settings (settingsToUse, takeOwnershipOfSettings), channelConfiguration (channels), + shouldMuteInput (! isInterAppAudioConnected()), autoOpenMidiDevices (shouldAutoOpenMidiDevices) { - shouldMuteInput.addListener (this); - shouldMuteInput = ! isInterAppAudioConnected(); - createPlugin(); auto inChannels = (channelConfiguration.size() > 0 ? channelConfiguration[0].numIns @@ -112,7 +109,7 @@ public: startTimer (500); } - virtual ~StandalonePluginHolder() override + virtual ~StandalonePluginHolder() { stopTimer(); @@ -161,7 +158,6 @@ public: //============================================================================== Value& getMuteInputValue() { return shouldMuteInput; } bool getProcessorHasPotentialFeedbackLoop() const { return processorHasPotentialFeedbackLoop; } - void valueChanged (Value& value) override { muteInput = (bool) value.getValue(); } //============================================================================== File getLastFile() const @@ -255,24 +251,37 @@ public: { DialogWindow::LaunchOptions o; - int maxNumInputs = 0, maxNumOutputs = 0; + int minNumInputs = std::numeric_limits::max(), maxNumInputs = 0, + minNumOutputs = std::numeric_limits::max(), maxNumOutputs = 0; + + auto updateMinAndMax = [] (int newValue, int& minValue, int& maxValue) + { + minValue = jmin (minValue, newValue); + maxValue = jmax (maxValue, newValue); + }; if (channelConfiguration.size() > 0) { - auto& defaultConfig = channelConfiguration.getReference (0); - - maxNumInputs = jmax (0, (int) defaultConfig.numIns); - maxNumOutputs = jmax (0, (int) defaultConfig.numOuts); + auto defaultConfig = channelConfiguration.getReference (0); + updateMinAndMax ((int) defaultConfig.numIns, minNumInputs, maxNumInputs); + updateMinAndMax ((int) defaultConfig.numOuts, minNumOutputs, maxNumOutputs); } if (auto* bus = processor->getBus (true, 0)) - maxNumInputs = jmax (0, bus->getDefaultLayout().size()); + updateMinAndMax (bus->getDefaultLayout().size(), minNumInputs, maxNumInputs); if (auto* bus = processor->getBus (false, 0)) - maxNumOutputs = jmax (0, bus->getDefaultLayout().size()); + updateMinAndMax (bus->getDefaultLayout().size(), minNumOutputs, maxNumOutputs); - o.content.setOwned (new SettingsComponent (*this, deviceManager, maxNumInputs, maxNumOutputs)); - o.content->setSize (500, 550); + minNumInputs = jmin (minNumInputs, maxNumInputs); + minNumOutputs = jmin (minNumOutputs, maxNumOutputs); + + o.content.setOwned (new SettingsComponent (*this, deviceManager, + minNumInputs, + maxNumInputs, + minNumOutputs, + maxNumOutputs)); + o.content->setSize (500, 240); o.dialogTitle = TRANS("Audio/MIDI Settings"); o.dialogBackgroundColour = o.content->getLookAndFeel().findColour (ResizableWindow::backgroundColourId); @@ -287,7 +296,7 @@ public: { if (settings != nullptr) { - auto xml = deviceManager.createStateXml(); + std::unique_ptr xml (deviceManager.createStateXml()); settings->setValue ("audioSetup", xml.get()); @@ -305,7 +314,7 @@ public: if (settings != nullptr) { - savedState = settings->getXmlValue ("audioSetup"); + savedState.reset (settings->getXmlValue ("audioSetup")); #if ! (JUCE_IOS || JUCE_ANDROID) shouldMuteInput.setValue (settings->getBoolValue ("shouldMuteInput", true)); @@ -397,13 +406,12 @@ public: // avoid feedback loop by default bool processorHasPotentialFeedbackLoop = true; - std::atomic muteInput { true }; Value shouldMuteInput; AudioBuffer emptyBuffer; bool autoOpenMidiDevices; std::unique_ptr options; - Array lastMidiDevices; + StringArray lastMidiDevices; private: //============================================================================== @@ -412,12 +420,14 @@ private: public: SettingsComponent (StandalonePluginHolder& pluginHolder, AudioDeviceManager& deviceManagerToUse, + int minAudioInputChannels, int maxAudioInputChannels, + int minAudioOutputChannels, int maxAudioOutputChannels) : owner (pluginHolder), deviceSelector (deviceManagerToUse, - 0, maxAudioInputChannels, - 0, maxAudioOutputChannels, + minAudioInputChannels, maxAudioInputChannels, + minAudioOutputChannels, maxAudioOutputChannels, true, (pluginHolder.processor.get() != nullptr && pluginHolder.processor->producesMidi()), true, false), @@ -482,7 +492,9 @@ private: int numOutputChannels, int numSamples) override { - if (muteInput) + const bool inputMuted = shouldMuteInput.getValue(); + + if (inputMuted) { emptyBuffer.clear(); inputChannelData = emptyBuffer.getArrayOfReadPointers(); @@ -514,7 +526,7 @@ private: const AudioDeviceManager::AudioDeviceSetup* preferredSetupOptions) { deviceManager.addAudioCallback (this); - deviceManager.addMidiInputDeviceCallback ({}, &player); + deviceManager.addMidiInputCallback ({}, &player); reloadAudioDeviceState (enableAudioInput, preferredDefaultDeviceName, preferredSetupOptions); } @@ -523,25 +535,23 @@ private: { saveAudioDeviceState(); - deviceManager.removeMidiInputDeviceCallback ({}, &player); + deviceManager.removeMidiInputCallback ({}, &player); deviceManager.removeAudioCallback (this); } void timerCallback() override { - auto newMidiDevices = MidiInput::getAvailableDevices(); + auto newMidiDevices = MidiInput::getDevices(); if (newMidiDevices != lastMidiDevices) { for (auto& oldDevice : lastMidiDevices) if (! newMidiDevices.contains (oldDevice)) - deviceManager.setMidiInputDeviceEnabled (oldDevice.identifier, false); + deviceManager.setMidiInputEnabled (oldDevice, false); for (auto& newDevice : newMidiDevices) if (! lastMidiDevices.contains (newDevice)) - deviceManager.setMidiInputDeviceEnabled (newDevice.identifier, true); - - lastMidiDevices = newMidiDevices; + deviceManager.setMidiInputEnabled (newDevice, true); } } @@ -559,7 +569,8 @@ private: @tags{Audio} */ class StandaloneFilterWindow : public DocumentWindow, - public Button::Listener + public Button::Listener, + public MenuBarModel { public: //============================================================================== @@ -584,20 +595,26 @@ public: bool autoOpenMidiDevices = true #endif ) - : DocumentWindow ("", Colours::black, DocumentWindow::minimiseButton | DocumentWindow::closeButton), - optionsButton ("Options") + : DocumentWindow (title, Colour::fromHSV (0.0f, 0.0f, 0.1f, 1.0f), DocumentWindow::minimiseButton | DocumentWindow::closeButton) + , menuBar(this) + #if ! JUCE_MAC + , optionsButton ("Settings") + #endif { #if JUCE_IOS || JUCE_ANDROID setTitleBarHeight (0); #else setTitleBarButtonsRequired (DocumentWindow::minimiseButton | DocumentWindow::closeButton, false); -#if JUCE_MAC - // setUsingNativeTitleBar(true); - /* todo menu bar */ -#endif + + #if JUCE_MAC + setUsingNativeTitleBar(true); + menu.addItem (1, TRANS("Audio/MIDI Settings...")); + MenuBarModel::setMacMainMenu (this, &menu); + #else Component::addAndMakeVisible (optionsButton); optionsButton.addListener (this); optionsButton.setTriggeredOnMouseDown (true); + #endif #endif pluginHolder.reset (new StandalonePluginHolder (settingsToUse, takeOwnershipOfSettings, @@ -608,7 +625,6 @@ public: setFullScreen (true); setContentOwned (new MainContentComponent (*this), false); #else - setContentOwned (new MainContentComponent (*this), true); if (auto* props = pluginHolder->settings.get()) @@ -628,15 +644,19 @@ public: #endif } - ~StandaloneFilterWindow() override + ~StandaloneFilterWindow() { + #if JUCE_MAC + setMacMainMenu(nullptr); + #endif #if (! JUCE_IOS) && (! JUCE_ANDROID) if (auto* props = pluginHolder->settings.get()) { props->setValue ("windowX", getX()); props->setValue ("windowY", getY()); } - #endif + #endif + pluginHolder->stopPlaying(); clearContentComponent(); pluginHolder = nullptr; @@ -669,10 +689,34 @@ public: JUCEApplicationBase::quit(); } + StringArray getMenuBarNames() override + { +// StringArray menuBarNames; +// menuBarNames.add("Options"); +// return menuBarNames; + const char *menuNames[] = { 0 }; + + return StringArray (menuNames); + } + + PopupMenu getMenuForIndex (int topLevelMenuIndex, const String& menuName) override + { + PopupMenu m; +// m.addItem (1, TRANS("Audio Settings...")); +// m.addSeparator(); + + return m; + } + + void menuItemSelected (int menuItemID, int topLevelMenuIndex) override + { + handleMenuResult(menuItemID); + } + + void menuBarActivated (bool isActive) override {}; + void buttonClicked (Button*) override { - pluginHolder->showAudioSettingsDialog(); - /* PopupMenu m; m.addItem (1, TRANS("Audio/MIDI Settings...")); m.addSeparator(); @@ -683,7 +727,6 @@ public: m.showMenuAsync (PopupMenu::Options(), ModalCallbackFunction::forComponent (menuCallback, this)); - */ } void handleMenuResult (int result) @@ -707,12 +750,16 @@ public: void resized() override { DocumentWindow::resized(); + #if ! JUCE_MAC optionsButton.setBounds (8, 6, 60, getTitleBarHeight() - 8); + #endif } virtual StandalonePluginHolder* getPluginHolder() { return pluginHolder.get(); } std::unique_ptr pluginHolder; + MenuBarComponent menuBar; + PopupMenu menu; private: //============================================================================== @@ -724,8 +771,7 @@ private: public: MainContentComponent (StandaloneFilterWindow& filterWindow) : owner (filterWindow), notification (this), - editor (owner.getAudioProcessor()->hasEditor() ? owner.getAudioProcessor()->createEditorIfNeeded() - : new GenericAudioProcessorEditor (*owner.getAudioProcessor())) + editor (owner.getAudioProcessor()->createEditorIfNeeded()) { Value& inputMutedValue = owner.pluginHolder->getMuteInputValue(); @@ -748,7 +794,7 @@ private: inputMutedChanged (shouldShowNotification); } - ~MainContentComponent() override + ~MainContentComponent() { if (editor != nullptr) { @@ -765,9 +811,7 @@ private: if (shouldShowNotification) notification.setBounds (r.removeFromTop (NotificationArea::height)); - if (editor != nullptr) - editor->setBounds (editor->getLocalArea (this, r) - .withPosition (r.getTopLeft().transformedBy (editor->getTransform().inverted()))); + editor->setBounds (r); } private: @@ -827,13 +871,9 @@ private: #if JUCE_IOS || JUCE_ANDROID resized(); #else - if (editor != nullptr) - { - auto rect = getSizeToContainEditor(); - - setSize (rect.getWidth(), - rect.getHeight() + (shouldShowNotification ? NotificationArea::height : 0)); - } + setSize (editor->getWidth(), + editor->getHeight() + + (shouldShowNotification ? NotificationArea::height : 0)); #endif } @@ -848,23 +888,11 @@ private: } //============================================================================== - void componentMovedOrResized (Component&, bool, bool) override + void componentMovedOrResized (Component&, bool, bool wasResized) override { - if (editor != nullptr) - { - auto rect = getSizeToContainEditor(); - - setSize (rect.getWidth(), - rect.getHeight() + (shouldShowNotification ? NotificationArea::height : 0)); - } - } - - Rectangle getSizeToContainEditor() const - { - if (editor != nullptr) - return getLocalArea (editor.get(), editor->getLocalBounds()); - - return {}; + if (wasResized && editor != nullptr) + setSize (editor->getWidth(), + editor->getHeight() + (shouldShowNotification ? NotificationArea::height : 0)); } //============================================================================== @@ -877,7 +905,9 @@ private: }; //============================================================================== + #if ! JUCE_MAC TextButton optionsButton; + #endif JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (StandaloneFilterWindow) }; diff --git a/OB-Xd.jucer b/OB-Xd.jucer index 4246c19..4f24773 100644 --- a/OB-Xd.jucer +++ b/OB-Xd.jucer @@ -1,19 +1,19 @@ - - + @@ -67,47 +67,47 @@ - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + targetName="OB-Xd" linuxArchitecture="-m64"/> - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -137,64 +137,66 @@ - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - - - - - - - + useGlobalPath="0"/> + + + + + + + + + diff --git a/Source/Gui/ButtonList.h b/Source/Gui/ButtonList.h index 5013018..4e0fb5f 100755 --- a/Source/Gui/ButtonList.h +++ b/Source/Gui/ButtonList.h @@ -23,38 +23,73 @@ */ #pragma once #include "../Source/Engine/SynthEngine.h" -class ButtonList : public ComboBox{ -private : - int count; - Image kni; - int w2,h2; + +class ButtonList : public ComboBox +{ public: - ButtonList(Image k,int fh) :ComboBox("cb") + ButtonList (Image k, int fh) : ComboBox("cb") { kni = k; count = 0; - h2 =fh; + h2 = fh; w2 = k.getWidth(); } //int addItem - void addChoise(String name) + +// Source: https://git.iem.at/audioplugins/IEMPluginSuite/-/blob/master/resources/customComponents/ReverseSlider.h +public: + class ButtonListAttachment : public juce::AudioProcessorValueTreeState::ComboBoxAttachment + { + public: + ButtonListAttachment (juce::AudioProcessorValueTreeState& stateToControl, + const juce::String& parameterID, + ButtonList& buttonListToControl) : AudioProcessorValueTreeState::ComboBoxAttachment (stateToControl, parameterID, buttonListToControl) + { + buttonListToControl.setParameter (stateToControl.getParameter (parameterID)); + } + + ButtonListAttachment (juce::AudioProcessorValueTreeState& stateToControl, + const juce::String& parameterID, + ComboBox& buttonListToControl) : AudioProcessorValueTreeState::ComboBoxAttachment (stateToControl, parameterID, buttonListToControl) + { + } + + virtual ~ButtonListAttachment() = default; + }; + + void setParameter (const AudioProcessorParameter* p) + { + if (parameter == p) + return; + + parameter = p; + repaint(); + } + + void addChoice (String name) { - addItem(name,++count); + addItem (name, ++count); } + float getValue() { - return ((getSelectedId()-1)/ (float)(count-1)); + return ((getSelectedId() - 1) / (float) (count - 1)); } - void setValue(float val,NotificationType notify) + + void setValue (float val, NotificationType notify) { - setSelectedId((int)(val*(count -1) + 1),notify); + setSelectedId ((int) (val * (count - 1) + 1), notify); } - void paintOverChildren(Graphics& g) + + void paintOverChildren (Graphics& g) override { - int ofs = getSelectedId()-1; - g.drawImage(kni, 0, 0, getWidth(), getHeight(), - 0, h2*ofs, w2, h2); + int ofs = getSelectedId() - 1; + g.drawImage(kni, 0, 0, getWidth(), getHeight(), 0, h2 * ofs, w2, h2); } - +private: + int count; + Image kni; + int w2, h2; + const AudioProcessorParameter* parameter {nullptr}; }; diff --git a/Source/Gui/Knob.h b/Source/Gui/Knob.h index b7d465e..916f232 100755 --- a/Source/Gui/Knob.h +++ b/Source/Gui/Knob.h @@ -2,7 +2,7 @@ ============================================================================== This file is part of Obxd synthesizer. - Copyright © 2013-2014 Filatov Vadim + Copyright � 2013-2014 Filatov Vadim Contact author via email : justdat_@_e1.ru @@ -23,6 +23,7 @@ */ #pragma once #include "../Source/Engine/SynthEngine.h" + class Knob : public Slider { public: @@ -33,23 +34,54 @@ public: // setSliderStyle(RotaryVerticalDrag); // setRange(0.0f, 1.0f, 0.001f); //} - Knob(Image k,int fh) : Slider("Knob") + Knob (Image k, int fh) : Slider("Knob") { - h2 =fh; + h2 = fh; w2 = k.getWidth(); numFr = k.getHeight() / h2; kni = k; }; - - void paint(Graphics& g) - { - int ofs = (int)((getValue() - getMinimum()) / (getMaximum() - getMinimum()) * (numFr - 1)); - g.drawImage(kni, 0, 0, getWidth(), getHeight(), - 0, h2*ofs, w2, h2); +// Source: https://git.iem.at/audioplugins/IEMPluginSuite/-/blob/master/resources/customComponents/ReverseSlider.h +public: + class KnobAttachment : public juce::AudioProcessorValueTreeState::SliderAttachment + { + public: + KnobAttachment (juce::AudioProcessorValueTreeState& stateToControl, + const juce::String& parameterID, + Knob& sliderToControl) : AudioProcessorValueTreeState::SliderAttachment (stateToControl, parameterID, sliderToControl) + { + sliderToControl.setParameter (stateToControl.getParameter (parameterID)); + } + + KnobAttachment (juce::AudioProcessorValueTreeState& stateToControl, + const juce::String& parameterID, + Slider& sliderToControl) : AudioProcessorValueTreeState::SliderAttachment (stateToControl, parameterID, sliderToControl) + { + } + + virtual ~KnobAttachment() = default; + }; + + void setParameter (const AudioProcessorParameter* p) + { + if (parameter == p) + return; + + parameter = p; + updateText(); + repaint(); + } + + void paint (Graphics& g) override + { + int ofs = (int) ((getValue() - getMinimum()) / (getMaximum() - getMinimum()) * (numFr - 1)); + g.drawImage (kni, 0, 0, getWidth(), getHeight(), 0, h2 * ofs, w2, h2); } + private: Image kni; - int fh,numFr; - int w2,h2; -}; \ No newline at end of file + int fh, numFr; + int w2, h2; + const AudioProcessorParameter* parameter {nullptr}; +}; diff --git a/Source/Gui/TooglableButton.h b/Source/Gui/TooglableButton.h index a43b356..fa572ac 100755 --- a/Source/Gui/TooglableButton.h +++ b/Source/Gui/TooglableButton.h @@ -2,7 +2,7 @@ ============================================================================== This file is part of Obxd synthesizer. - Copyright © 2013-2014 Filatov Vadim + Copyright � 2013-2014 Filatov Vadim Contact author via email : justdat_@_e1.ru @@ -23,24 +23,55 @@ */ #pragma once #include "../Source/Engine/SynthEngine.h" -class TooglableButton : public ImageButton + +class TooglableButton : public ImageButton { public: - bool toogled; - TooglableButton(Image k) :ImageButton() + TooglableButton (Image k) : ImageButton() { //this->setImages kni = k; toogled = false; width = kni.getWidth(); height = kni.getHeight(); - w2=width; + w2 = width; h2 = height / 2; - this->setClickingTogglesState(true); + this->setClickingTogglesState (true); } - void clicked() + +// Source: https://git.iem.at/audioplugins/IEMPluginSuite/-/blob/master/resources/customComponents/ReverseSlider.h +public: + class ToggleAttachment : public juce::AudioProcessorValueTreeState::ButtonAttachment + { + public: + ToggleAttachment (juce::AudioProcessorValueTreeState& stateToControl, + const juce::String& parameterID, + TooglableButton& buttonToControl) : AudioProcessorValueTreeState::ButtonAttachment (stateToControl, parameterID, buttonToControl) + { + buttonToControl.setParameter (stateToControl.getParameter (parameterID)); + } + + ToggleAttachment (juce::AudioProcessorValueTreeState& stateToControl, + const juce::String& parameterID, + Button& buttonToControl) : AudioProcessorValueTreeState::ButtonAttachment (stateToControl, parameterID, buttonToControl) + { + } + + virtual ~ToggleAttachment() = default; + }; + + void setParameter (const AudioProcessorParameter* p) + { + if (parameter == p) + return; + + parameter = p; + repaint(); + } + + void clicked() override { - toogled = !toogled; + toogled = ! toogled; //this->setColour(1,Colours::blue); //if(toogled) // this->setColour(TextButton::ColourIds::buttonColourId,Colours::lightgreen); @@ -50,34 +81,43 @@ public: Button::clicked(); }; - void paintButton(Graphics& g, bool isMouseOverButton, bool isButtonDown) + + void paintButton (Graphics& g, bool isMouseOverButton, bool isButtonDown) override { - int offset = 0; + int offset = 0; + if (toogled) { offset = 1; } - g.drawImage(kni, 0, 0, getWidth(), getHeight(), - 0, offset *h2, w2,h2); + + g.drawImage(kni, 0, 0, getWidth(), getHeight(), 0, offset * h2, w2, h2); } - void setValue(float state,int notify) + + void setValue (float state, int notify) { - if(state > 0.5) - toogled = true; + if (state > 0.5) + toogled = true; else toogled = false; + repaint(); } + float getValue() { - if(toogled) - return 1; + if (toogled) + return 1; else return 0; } //void paint(Graphics& g) //{ // g.drawImageTransformed(kni,AffineTransform::rotation(((getValue() - getMinimum())/(getMaximum() - getMinimum()))*float_Pi - float_Pi*2)); //} + + bool toogled; + private: Image kni; - int width,height,w2,h2; -}; \ No newline at end of file + int width, height, w2, h2; + const AudioProcessorParameter* parameter {nullptr}; +}; diff --git a/Source/PluginEditor.cpp b/Source/PluginEditor.cpp index 494be13..a96107e 100755 --- a/Source/PluginEditor.cpp +++ b/Source/PluginEditor.cpp @@ -14,619 +14,466 @@ It contains the basic startup code for a Juce application. //============================================================================== -ObxdAudioProcessorEditor::ObxdAudioProcessorEditor (ObxdAudioProcessor* ownerFilter) - : AudioProcessorEditor (ownerFilter) +ObxdAudioProcessorEditor::ObxdAudioProcessorEditor (ObxdAudioProcessor& ownerFilter) + : AudioProcessorEditor (&ownerFilter), processor (ownerFilter) { - rebuildComponents(); + rebuildComponents (processor); } ObxdAudioProcessorEditor::~ObxdAudioProcessorEditor() { - getFilter()->removeChangeListener(this); - - deleteAllChildren(); + processor.removeChangeListener (this); +// deleteAllChildren(); // WATCH OUT! } -void ObxdAudioProcessorEditor::placeLabel(int x , int y , String text) +void ObxdAudioProcessorEditor::placeLabel (int x, int y, String text) { Label* lab = new Label(); - lab->setBounds(x,y,110,20); - lab->setJustificationType(Justification::centred); - lab->setText(text,dontSendNotification);lab->setInterceptsMouseClicks(false,true); - addAndMakeVisible(lab); + lab->setBounds (x, y, 110, 20); + lab->setJustificationType (Justification::centred); + lab->setText (text,dontSendNotification); + lab->setInterceptsMouseClicks (false, true); + addAndMakeVisible (lab); } -ButtonList* ObxdAudioProcessorEditor::addNormalButtonList(int x, int y,int width, ObxdAudioProcessor* filter, int parameter,String name,Image img) +ButtonList* ObxdAudioProcessorEditor::addNormalButtonList (int x, int y, int width, ObxdAudioProcessor& filter, int parameter, String /*name*/, Image img) { - ButtonList *bl = new ButtonList(img,24); - bl->setBounds(x, y, width, 24); + ButtonList *bl = new ButtonList (img, 24); + bl->setBounds (x, y, width, 24); //bl->setValue(filter->getParameter(parameter),dontSendNotification); - addAndMakeVisible(bl); - bl->addListener (this); + addAndMakeVisible (bl); +// bl->addListener (this); + return bl; } -Knob* ObxdAudioProcessorEditor::addNormalKnob(int x , int y ,ObxdAudioProcessor* filter, int parameter,String name,float defval) +Knob* ObxdAudioProcessorEditor::addNormalKnob (int x, int y, ObxdAudioProcessor& filter, int parameter, String /*name*/, float defval) { - Knob* knob = new Knob(ImageCache::getFromMemory(BinaryData::knoblsd_png,BinaryData::knoblsd_pngSize),48); + Knob* knob = new Knob (ImageCache::getFromMemory (BinaryData::knoblsd_png, BinaryData::knoblsd_pngSize), 48); //Label* knobl = new Label(); - knob->setSliderStyle(Slider::RotaryVerticalDrag); - knob->setTextBoxStyle(knob->NoTextBox,true,0,0); - knob->setRange(0,1); - addAndMakeVisible(knob); + knob->setSliderStyle (Slider::RotaryVerticalDrag); + knob->setTextBoxStyle (knob->NoTextBox, true, 0, 0); + knob->setRange (0, 1); + addAndMakeVisible (knob); //addAndMakeVisible(knobl); - knob->setBounds(x, y, 48,48); - knob->setValue(filter->getParameter(parameter),dontSendNotification); + knob->setBounds (x, y, 48, 48); +// knob->setValue (filter.getParameter (parameter), dontSendNotification); //knobl->setJustificationType(Justification::centred); //knobl->setInterceptsMouseClicks(false,true); //knobl->setBounds(x-10,y+40,60,10); //knobl->setText(name,dontSendNotification); - knob->setTextBoxIsEditable(false); - knob->setDoubleClickReturnValue(true,defval); - knob->addListener (this); + knob->setTextBoxIsEditable (false); + knob->setDoubleClickReturnValue (true, defval); +// knob->addListener (this); + knobAttachments.add (new Knob::KnobAttachment (filter.getPluginState(), + filter.getEngineParameterId (parameter), + *knob)); + return knob; } -Knob* ObxdAudioProcessorEditor::addNormalKnobClassic(int x , int y ,ObxdAudioProcessor* filter, int parameter,String name,float defval) +Knob* ObxdAudioProcessorEditor::addNormalKnobClassic (int x, int y, ObxdAudioProcessor& filter, int parameter, String /*name*/, float defval) { - Knob* knob = new Knob(ImageCache::getFromMemory(BinaryData::knoblsd_png,BinaryData::knoblsd_pngSize),48); + Knob* knob = new Knob (ImageCache::getFromMemory (BinaryData::knoblsd_png, BinaryData::knoblsd_pngSize), 48); //Label* knobl = new Label(); - knob->setSliderStyle(Slider::RotaryVerticalDrag); - knob->setTextBoxStyle(knob->NoTextBox,true,0,0); - knob->setRange(0,1); - addAndMakeVisible(knob); + knob->setSliderStyle (Slider::RotaryVerticalDrag); + knob->setTextBoxStyle (knob->NoTextBox, true, 0, 0); + knob->setRange (0, 1); + addAndMakeVisible (knob); //addAndMakeVisible(knobl); - knob->setBounds(x+2, y, 42,42); - knob->setValue(filter->getParameter(parameter),dontSendNotification); + knob->setBounds (x+2, y, 42, 42); +// knob->setValue(filter.getParameter(parameter),dontSendNotification); //knobl->setJustificationType(Justification::centred); //knobl->setInterceptsMouseClicks(false,true); //knobl->setBounds(x-10,y+40,60,10); //knobl->setText(name,dontSendNotification); - knob->setTextBoxIsEditable(false); - knob->setDoubleClickReturnValue(true,defval); - knob->addListener (this); + knob->setTextBoxIsEditable (false); + knob->setDoubleClickReturnValue (true, defval); +// knob->addListener (this); + knobAttachments.add (new Knob::KnobAttachment (filter.getPluginState(), + filter.getEngineParameterId (parameter), + *knob)); + return knob; } -Knob* ObxdAudioProcessorEditor::addTinyKnob(int x , int y ,ObxdAudioProcessor* filter, int parameter,String name,float defval) +Knob* ObxdAudioProcessorEditor::addTinyKnob (int x, int y, ObxdAudioProcessor& filter, int parameter, String /*name*/, float defval) { //Knob* knob = new Knob(ImageCache::getFromMemory(BinaryData::knobssd_png,BinaryData::knobssd_pngSize),42); - Knob* knob = new Knob(ImageCache::getFromMemory(BinaryData::knoblsd_png,BinaryData::knoblsd_pngSize),48); + Knob* knob = new Knob (ImageCache::getFromMemory (BinaryData::knoblsd_png, BinaryData::knoblsd_pngSize), 48); //Label* knobl = new Label(); - knob->setSliderStyle(Slider::RotaryVerticalDrag); - knob->setTextBoxStyle(knob->NoTextBox,true,0,0); - knob->setRange(0,1); - addAndMakeVisible(knob); + knob->setSliderStyle (Slider::RotaryVerticalDrag); + knob->setTextBoxStyle (knob->NoTextBox, true, 0, 0); + knob->setRange (0, 1); + addAndMakeVisible (knob); //addAndMakeVisible(knobl); - knob->setBounds(x, y, 36,36); - knob->setValue(filter->getParameter(parameter),dontSendNotification); + knob->setBounds (x, y, 36, 36); +// knob->setValue(filter.getParameter(parameter),dontSendNotification); //knobl->setJustificationType(Justification::centred); //knobl->setInterceptsMouseClicks(false,true); //knobl->setBounds(x-10,y+25,50,10); //knobl->setText(name,dontSendNotification); - knob->setTextBoxIsEditable(false); - knob->setDoubleClickReturnValue(true,defval); - knob->addListener (this); + knob->setTextBoxIsEditable (false); + knob->setDoubleClickReturnValue (true, defval); +// knob->addListener (this); + knobAttachments.add (new Knob::KnobAttachment (filter.getPluginState(), + filter.getEngineParameterId (parameter), + *knob)); + return knob; } -TooglableButton* ObxdAudioProcessorEditor::addNormalTooglableButton(int x , int y , ObxdAudioProcessor* filter,int parameter,String name) +TooglableButton* ObxdAudioProcessorEditor::addNormalTooglableButton (int x, int y, ObxdAudioProcessor& filter, int parameter, String name) { - TooglableButton* button = new TooglableButton(ImageCache::getFromMemory(BinaryData::button_png,BinaryData::button_pngSize)); + TooglableButton* button = new TooglableButton (ImageCache::getFromMemory (BinaryData::button_png, BinaryData::button_pngSize)); // button->setButtonStyle(DrawableButton::ButtonStyle::ImageAboveTextLabel); - addAndMakeVisible(button); - button->setBounds(x,y,19,35); - button->setButtonText(name); - button->setValue(filter->getParameter(parameter),0); - button->addListener(this); + addAndMakeVisible (button); + button->setBounds (x, y, 19, 35); + button->setButtonText (name); +// button->setValue(filter.getParameter(parameter),0); +// button->addListener(this); + toggleAttachments.add (new TooglableButton::ToggleAttachment (filter.getPluginState(), + filter.getEngineParameterId (parameter), + *button)); + return button; } -TooglableButton* ObxdAudioProcessorEditor::addTinyTooglableButton(int x , int y , ObxdAudioProcessor* filter,int parameter,String name) +TooglableButton* ObxdAudioProcessorEditor::addTinyTooglableButton (int x, int y, ObxdAudioProcessor& filter, int parameter, String name) { - TooglableButton* button = new TooglableButton(ImageCache::getFromMemory(BinaryData::button_png,BinaryData::button_pngSize)); + TooglableButton* button = new TooglableButton (ImageCache::getFromMemory (BinaryData::button_png, BinaryData::button_pngSize)); // button->setButtonStyle(DrawableButton::ButtonStyle::ImageAboveTextLabel); - addAndMakeVisible(button); - button->setBounds(x,y,20,20); - button->setButtonText(name); - button->setValue(filter->getParameter(parameter),0); - button->addListener(this); + addAndMakeVisible (button); + button->setBounds (x, y, 20, 20); + button->setButtonText (name); +// button->setValue(filter.getParameter(parameter),0); +// button->addListener(this); + toggleAttachments.add (new TooglableButton::ToggleAttachment (filter.getPluginState(), + filter.getEngineParameterId (parameter), + *button)); + return button; } -ButtonList* ObxdAudioProcessorEditor::addNormalButtonListClassic(int x, int y,int width, ObxdAudioProcessor* filter, int parameter,String name,Image img) +ButtonList* ObxdAudioProcessorEditor::addNormalButtonListClassic (int x, int y, int width, ObxdAudioProcessor& filter, int parameter, String /*name*/, Image img) { - ButtonList *bl = new ButtonList(img,32); - bl->setBounds(x, y, width, 32); + ButtonList *bl = new ButtonList (img, 32); + bl->setBounds (x, y, width, 32); //bl->setValue(filter->getParameter(parameter),dontSendNotification); - addAndMakeVisible(bl); - bl->addListener (this); + addAndMakeVisible (bl); +// bl->addListener (this); + buttonListAttachments.add (new ButtonList::ButtonListAttachment (filter.getPluginState(), + filter.getEngineParameterId (parameter), + *bl)); + return bl; } -Knob* ObxdAudioProcessorEditor::addTinyKnobClassic(int x , int y ,ObxdAudioProcessor* filter, int parameter,String name,float defval) +Knob* ObxdAudioProcessorEditor::addTinyKnobClassic (int x, int y, ObxdAudioProcessor& filter, int parameter, String /*name*/, float defval) { - Knob* knob = new Knob(ImageCache::getFromMemory(BinaryData::knoblsd_png,BinaryData::knoblsd_pngSize),48); + Knob* knob = new Knob (ImageCache::getFromMemory (BinaryData::knoblsd_png, BinaryData::knoblsd_pngSize), 48); //Label* knobl = new Label(); - knob->setSliderStyle(Slider::RotaryVerticalDrag); - knob->setTextBoxStyle(knob->NoTextBox,true,0,0); - knob->setRange(0,1); - addAndMakeVisible(knob); + knob->setSliderStyle (Slider::RotaryVerticalDrag); + knob->setTextBoxStyle (knob->NoTextBox, true, 0, 0); + knob->setRange (0, 1); + addAndMakeVisible (knob); //addAndMakeVisible(knobl); - knob->setBounds(x+3, y+3, 36,36); - knob->setValue(filter->getParameter(parameter),dontSendNotification); + knob->setBounds (x+3, y+3, 36, 36); +// knob->setValue(filter.getParameter(parameter),dontSendNotification); //knobl->setJustificationType(Justification::centred); //knobl->setInterceptsMouseClicks(false,true); //knobl->setBounds(x-10,y+25,50,10); //knobl->setText(name,dontSendNotification); - knob->setTextBoxIsEditable(false); - knob->setDoubleClickReturnValue(true,defval); - knob->addListener (this); + knob->setTextBoxIsEditable (false); + knob->setDoubleClickReturnValue (true, defval); +// knob->addListener (this); + knobAttachments.add (new Knob::KnobAttachment (filter.getPluginState(), + filter.getEngineParameterId (parameter), + *knob)); + return knob; } -TooglableButton* ObxdAudioProcessorEditor::addNormalTooglableButtonClassic(int x , int y , ObxdAudioProcessor* filter,int parameter,String name) +TooglableButton* ObxdAudioProcessorEditor::addNormalTooglableButtonClassic (int x, int y, ObxdAudioProcessor& filter, int parameter, String name) { - TooglableButton* button = new TooglableButton(ImageCache::getFromFile(skinFolder.getChildFile("button.png"))); + TooglableButton* button = new TooglableButton (ImageCache::getFromFile (skinFolder.getChildFile ("button.png"))); // button->setButtonStyle(DrawableButton::ButtonStyle::ImageAboveTextLabel); - addAndMakeVisible(button); - button->setBounds(x,y,28,35); - button->setButtonText(name); - button->setValue(filter->getParameter(parameter),0); - button->addListener(this); + addAndMakeVisible (button); + button->setBounds (x, y, 28, 35); + button->setButtonText (name); +// button->setValue(filter.getParameter(parameter),0); +// button->addListener(this); + toggleAttachments.add (new TooglableButton::ToggleAttachment (filter.getPluginState(), + filter.getEngineParameterId (parameter), + *button)); + return button; } -void ObxdAudioProcessorEditor::rebuildComponents() +void ObxdAudioProcessorEditor::rebuildComponents (ObxdAudioProcessor& ownerFilter) { - ObxdAudioProcessor* ownerFilter = getFilter(); + skinFolder = ownerFilter.getCurrentSkinFolder(); + bool useClassicSkin = skinFolder.getChildFile ("legato.png").existsAsFile(); - skinFolder = ownerFilter->getCurrentSkinFolder(); - bool useClassicSkin = skinFolder.getChildFile("legato.png").existsAsFile(); + ownerFilter.removeChangeListener (this); - ownerFilter->removeChangeListener(this); - - deleteAllChildren(); + deleteAllChildren(); // WATCH OUT! if (! useClassicSkin) { // This is where our plugin's editor size is set. setSize (1440, 450); - cutoffKnob = addNormalKnob(893,77,ownerFilter,CUTOFF,"Cutoff",0.4); - resonanceKnob = addNormalKnob(990,77,ownerFilter,RESONANCE,"Resonance",0); - filterEnvelopeAmtKnob = addNormalKnob(1088,77,ownerFilter,ENVELOPE_AMT,"Envelope",0); - multimodeKnob = addNormalKnob(990,167,ownerFilter,MULTIMODE,"Multimode",0.5); + cutoffKnob = addNormalKnob (893, 77, ownerFilter, CUTOFF, "Cutoff", 0.4); + resonanceKnob = addNormalKnob (990, 77, ownerFilter, RESONANCE, "Resonance", 0); + filterEnvelopeAmtKnob = addNormalKnob (1088, 77, ownerFilter, ENVELOPE_AMT, "Envelope", 0); + multimodeKnob = addNormalKnob (990, 167, ownerFilter, MULTIMODE, "Multimode", 0.5); - volumeKnob = addNormalKnob(56,77,ownerFilter,VOLUME,"Volume",0.4); - portamentoKnob = addNormalKnob(188,77,ownerFilter,PORTAMENTO,"Portamento",0); - osc1PitchKnob = addNormalKnob(593,77,ownerFilter,OSC1P,"Osc1Pitch",0); - pulseWidthKnob = addNormalKnob(691,77,ownerFilter,PW,"PW",0); - osc2PitchKnob = addNormalKnob(788,77,ownerFilter,OSC2P,"Osc2Pitch",0); + volumeKnob = addNormalKnob (56, 77, ownerFilter, VOLUME, "Volume", 0.4); + portamentoKnob = addNormalKnob (188, 77, ownerFilter, PORTAMENTO, "Portamento", 0); + osc1PitchKnob = addNormalKnob (593, 77, ownerFilter, OSC1P, "Osc1Pitch", 0); + pulseWidthKnob = addNormalKnob (691, 77, ownerFilter, PW, "PW", 0); + osc2PitchKnob = addNormalKnob (788, 77, ownerFilter, OSC2P, "Osc2Pitch", 0); - osc1MixKnob = addNormalKnob(597,237,ownerFilter,OSC1MIX,"Osc1",1); - osc2MixKnob = addNormalKnob(788,237,ownerFilter,OSC2MIX,"Osc2",1); - noiseMixKnob = addNormalKnob(691,237,ownerFilter,NOISEMIX,"Noise",0); + osc1MixKnob = addNormalKnob (597, 237, ownerFilter, OSC1MIX, "Osc1", 1); + osc2MixKnob = addNormalKnob (788, 237, ownerFilter, OSC2MIX, "Osc2", 1); + noiseMixKnob = addNormalKnob (691, 237, ownerFilter, NOISEMIX, "Noise", 0); - xmodKnob = addNormalKnob(656,324,ownerFilter,XMOD,"Xmod",0); - osc2DetuneKnob = addNormalKnob(800,324,ownerFilter,OSC2_DET,"Detune",0); + xmodKnob = addNormalKnob (656, 324, ownerFilter, XMOD, "Xmod", 0); + osc2DetuneKnob = addNormalKnob (800, 324, ownerFilter, OSC2_DET, "Detune", 0); - envPitchModKnob = addNormalKnob(728,324,ownerFilter,ENVPITCH,"PEnv",0); - brightnessKnob = addNormalKnob(586,324,ownerFilter,BRIGHTNESS,"Bri",1); + envPitchModKnob = addNormalKnob (728, 324, ownerFilter, ENVPITCH, "PEnv", 0); + brightnessKnob = addNormalKnob (586, 324, ownerFilter, BRIGHTNESS, "Bri", 1); - attackKnob = addNormalKnob(1182,165,ownerFilter,LATK,"Atk",0); - decayKnob = addNormalKnob(1246,165,ownerFilter,LDEC,"Dec",0); - sustainKnob = addNormalKnob(1309,165,ownerFilter,LSUS,"Sus",1); - releaseKnob = addNormalKnob(1373,165,ownerFilter,LREL,"Rel",0); + attackKnob = addNormalKnob (1182, 165, ownerFilter, LATK, "Atk", 0); + decayKnob = addNormalKnob (1246, 165, ownerFilter, LDEC, "Dec", 0); + sustainKnob = addNormalKnob (1309, 165, ownerFilter, LSUS, "Sus", 1); + releaseKnob = addNormalKnob (1373, 165, ownerFilter, LREL, "Rel", 0); - fattackKnob = addNormalKnob(1182,75,ownerFilter,FATK,"Atk",0); - fdecayKnob = addNormalKnob(1246,75,ownerFilter,FDEC,"Dec",0); - fsustainKnob = addNormalKnob(1309,75,ownerFilter,FSUS,"Sus",1); - freleaseKnob = addNormalKnob(1373,75,ownerFilter,FREL,"Rel",0); + fattackKnob = addNormalKnob (1182, 75, ownerFilter, FATK, "Atk", 0); + fdecayKnob = addNormalKnob (1246, 75, ownerFilter, FDEC, "Dec", 0); + fsustainKnob = addNormalKnob (1309, 75, ownerFilter, FSUS, "Sus", 1); + freleaseKnob = addNormalKnob (1373, 75, ownerFilter, FREL, "Rel", 0); - lfoFrequencyKnob = addNormalKnob(293,77,ownerFilter,LFOFREQ,"Freq",0); - lfoAmt1Knob = addNormalKnob(390,77,ownerFilter,LFO1AMT,"Pitch",0); - lfoAmt2Knob = addNormalKnob(488,77,ownerFilter,LFO2AMT,"PWM",0); + lfoFrequencyKnob = addNormalKnob (293, 77, ownerFilter, LFOFREQ, "Freq", 0); + lfoAmt1Knob = addNormalKnob (390, 77, ownerFilter, LFO1AMT, "Pitch", 0); + lfoAmt2Knob = addNormalKnob (488, 77, ownerFilter, LFO2AMT, "PWM", 0); - lfoSinButton = addNormalTooglableButton(309,162,ownerFilter,LFOSINWAVE,"Sin"); - lfoSquareButton = addNormalTooglableButton(309,252,ownerFilter,LFOSQUAREWAVE,"SQ"); - lfoSHButton = addNormalTooglableButton(309,335,ownerFilter,LFOSHWAVE,"S&H"); + lfoSinButton = addNormalTooglableButton (309, 162, ownerFilter, LFOSINWAVE, "Sin"); + lfoSquareButton = addNormalTooglableButton (309, 252, ownerFilter, LFOSQUAREWAVE, "SQ"); + lfoSHButton = addNormalTooglableButton (309, 335, ownerFilter, LFOSHWAVE, "S&H"); - lfoOsc1Button = addNormalTooglableButton(406,162,ownerFilter,LFOOSC1,"Osc1"); - lfoOsc2Button = addNormalTooglableButton(406,252,ownerFilter,LFOOSC2,"Osc2"); - lfoFilterButton = addNormalTooglableButton(406,335,ownerFilter,LFOFILTER,"Filt"); + lfoOsc1Button = addNormalTooglableButton (406, 162, ownerFilter, LFOOSC1, "Osc1"); + lfoOsc2Button = addNormalTooglableButton (406, 252, ownerFilter, LFOOSC2, "Osc2"); + lfoFilterButton = addNormalTooglableButton (406, 335, ownerFilter, LFOFILTER, "Filt"); - lfoPwm1Button = addNormalTooglableButton(504,162,ownerFilter,LFOPW1,"Osc1"); - lfoPwm2Button = addNormalTooglableButton(504,252,ownerFilter,LFOPW2,"Osc2"); + lfoPwm1Button = addNormalTooglableButton (504, 162, ownerFilter, LFOPW1, "Osc1"); + lfoPwm2Button = addNormalTooglableButton (504, 252, ownerFilter, LFOPW2, "Osc2"); - hardSyncButton = addNormalTooglableButton(730,162,ownerFilter,OSC2HS,"Sync"); - osc1SawButton = addNormalTooglableButton(587,162,ownerFilter,OSC1Saw,"S"); - osc2SawButton = addNormalTooglableButton(782,162,ownerFilter,OSC2Saw,"S"); + hardSyncButton = addNormalTooglableButton (730, 162, ownerFilter, OSC2HS, "Sync"); + osc1SawButton = addNormalTooglableButton (587, 162, ownerFilter, OSC1Saw, "S"); + osc2SawButton = addNormalTooglableButton (782, 162, ownerFilter, OSC2Saw, "S"); - osc1PulButton = addNormalTooglableButton(632,162,ownerFilter,OSC1Pul,"P"); - osc2PulButton = addNormalTooglableButton(827,162,ownerFilter,OSC2Pul,"P"); + osc1PulButton = addNormalTooglableButton (632, 162, ownerFilter, OSC1Pul, "P"); + osc2PulButton = addNormalTooglableButton (827, 162, ownerFilter, OSC2Pul, "P"); - pitchQuantButton = addNormalTooglableButton(684,162,ownerFilter,OSCQuantize,"Step"); + pitchQuantButton = addNormalTooglableButton (684, 162, ownerFilter, OSCQuantize, "Step"); - filterBPBlendButton = addNormalTooglableButton(1082,162,ownerFilter,BANDPASS,"Bp"); - fourPoleButton = addNormalTooglableButton(1127,162,ownerFilter,FOURPOLE,"24"); - filterHQButton = addNormalTooglableButton(932,162,ownerFilter,FILTER_WARM,"HQ"); + filterBPBlendButton = addNormalTooglableButton (1082, 162, ownerFilter, BANDPASS, "Bp"); + fourPoleButton = addNormalTooglableButton (1127, 162, ownerFilter, FOURPOLE, "24"); + filterHQButton = addNormalTooglableButton (932, 162, ownerFilter, FILTER_WARM, "HQ"); - filterKeyFollowButton = addNormalTooglableButton(887,162,ownerFilter,FLT_KF,"Key"); - unisonButton = addNormalTooglableButton(205,162,ownerFilter,UNISON,"Uni"); + filterKeyFollowButton = addNormalTooglableButton (887, 162, ownerFilter, FLT_KF, "Key"); + unisonButton = addNormalTooglableButton (205, 162, ownerFilter, UNISON, "Uni"); - tuneKnob = addNormalKnob(30,252,ownerFilter,TUNE,"Tune",0.5); - transposeKnob = addNormalKnob(90,252,ownerFilter,OCTAVE,"Transpose",0.5); + tuneKnob = addNormalKnob (30, 252, ownerFilter, TUNE, "Tune", 0.5); + transposeKnob = addNormalKnob (90, 252, ownerFilter, OCTAVE, "Transpose", 0.5); - voiceDetuneKnob =addNormalKnob(188,252,ownerFilter,UDET,"VoiceDet",0); + voiceDetuneKnob =addNormalKnob (188, 252, ownerFilter, UDET, "VoiceDet", 0); - bendLfoRateKnob = addTinyKnob(928,300,ownerFilter,BENDLFORATE,"ModRate",0.4); - veloFltEnvKnob = addTinyKnob(1013,300,ownerFilter,VFLTENV,"VFE",0); - veloAmpEnvKnob = addTinyKnob(1111,300,ownerFilter,VAMPENV,"VAE",0); + bendLfoRateKnob = addTinyKnob (928, 300, ownerFilter, BENDLFORATE, "ModRate", 0.4); + veloFltEnvKnob = addTinyKnob (1013, 300, ownerFilter, VFLTENV, "VFE", 0); + veloAmpEnvKnob = addTinyKnob (1111, 300, ownerFilter, VAMPENV, "VAE", 0); - midiLearnButton = addNormalTooglableButton(74,162,ownerFilter,MIDILEARN,"LEA"); - midiUnlearnButton = addNormalTooglableButton(122,162,ownerFilter,UNLEARN,"UNL"); + midiLearnButton = addNormalTooglableButton (74, 162, ownerFilter, MIDILEARN, "LEA"); + midiUnlearnButton = addNormalTooglableButton (122, 162, ownerFilter, UNLEARN, "UNL"); - pan1Knob = addTinyKnob(914,368,ownerFilter,PAN1,"1",0.5); - pan2Knob = addTinyKnob(977,368,ownerFilter,PAN2,"2",0.5); - pan3Knob = addTinyKnob(1040,368,ownerFilter,PAN3,"3",0.5); - pan4Knob = addTinyKnob(1103,368,ownerFilter,PAN4,"4",0.5); + pan1Knob = addTinyKnob (914, 368, ownerFilter, PAN1, "1", 0.5); + pan2Knob = addTinyKnob (977, 368, ownerFilter, PAN2, "2", 0.5); + pan3Knob = addTinyKnob (1040, 368, ownerFilter, PAN3, "3", 0.5); + pan4Knob = addTinyKnob (1103, 368, ownerFilter, PAN4, "4", 0.5); - pan5Knob = addTinyKnob(1165,368,ownerFilter,PAN5,"5",0.5); - pan6Knob = addTinyKnob(1228,368,ownerFilter,PAN6,"6",0.5); - pan7Knob = addTinyKnob(1290,368,ownerFilter,PAN7,"7",0.5); - pan8Knob = addTinyKnob(1353,368,ownerFilter,PAN8,"8",0.5); + pan5Knob = addTinyKnob (1165, 368, ownerFilter, PAN5, "5", 0.5); + pan6Knob = addTinyKnob (1228, 368, ownerFilter, PAN6, "6", 0.5); + pan7Knob = addTinyKnob (1290, 368, ownerFilter, PAN7, "7", 0.5); + pan8Knob = addTinyKnob (1353, 368, ownerFilter, PAN8, "8", 0.5); - bendOsc2OnlyButton = addNormalTooglableButton(228,335,ownerFilter,BENDOSC2,"Osc2"); - bendRangeButton = addNormalTooglableButton(183,335,ownerFilter,BENDRANGE,"12"); - asPlayedAllocButton = addNormalTooglableButton(25,162,ownerFilter,ASPLAYEDALLOCATION,"APA"); + bendOsc2OnlyButton = addNormalTooglableButton (228, 335, ownerFilter, BENDOSC2, "Osc2"); + bendRangeButton = addNormalTooglableButton (183, 335, ownerFilter, BENDRANGE, "12"); + asPlayedAllocButton = addNormalTooglableButton (25, 162, ownerFilter, ASPLAYEDALLOCATION, "APA"); - filterDetuneKnob = addTinyKnob(1228,300,ownerFilter,FILTERDER,"Flt",0.2); - portamentoDetuneKnob = addTinyKnob(1291,300,ownerFilter,PORTADER,"Port",0.2); - envelopeDetuneKnob = addTinyKnob(1353,300,ownerFilter,ENVDER,"Env",0.2); + filterDetuneKnob = addTinyKnob (1228, 300, ownerFilter, FILTERDER, "Flt", 0.2); + portamentoDetuneKnob = addTinyKnob (1291, 300, ownerFilter, PORTADER, "Port", 0.2); + envelopeDetuneKnob = addTinyKnob (1353, 300, ownerFilter, ENVDER, "Env", 0.2); - voiceSwitch = addNormalButtonList(124,338,17,ownerFilter,VOICE_COUNT,"VoiceCount",ImageCache::getFromMemory(BinaryData::voices_png,BinaryData::voices_pngSize)); - for (int i=1; i <= 32; i++) - voiceSwitch ->addChoise(String(i)); - voiceSwitch ->setValue(ownerFilter->getParameter(VOICE_COUNT),dontSendNotification); + voiceSwitch = addNormalButtonList (124, 338, 17, ownerFilter, VOICE_COUNT, "VoiceCount", ImageCache::getFromMemory (BinaryData::voices_png, BinaryData::voices_pngSize)); + + for (int i = 1; i <= 32; ++i) + { + voiceSwitch->addChoice (String (i)); + } - legatoSwitch = addNormalButtonList(25,338,65,ownerFilter,LEGATOMODE,"Legato",ImageCache::getFromMemory(BinaryData::legato_png,BinaryData::legato_pngSize)); - legatoSwitch ->addChoise("Keep All"); - legatoSwitch ->addChoise("Keep Filter Envelope"); - legatoSwitch ->addChoise("Keep Amplitude Envelope"); - legatoSwitch ->addChoise("Retrig"); - legatoSwitch ->setValue(ownerFilter->getParameter(LEGATOMODE),dontSendNotification); + legatoSwitch = addNormalButtonList (25, 338, 65, ownerFilter, LEGATOMODE, "Legato", ImageCache::getFromMemory (BinaryData::legato_png, BinaryData::legato_pngSize)); + legatoSwitch->addChoice ("Keep All"); + legatoSwitch->addChoice ("Keep Filter Envelope"); + legatoSwitch->addChoice ("Keep Amplitude Envelope"); + legatoSwitch->addChoice ("Retrig"); } else { // This is where our plugin's editor size is set. setSize (1087, 442); - cutoffKnob = addNormalKnobClassic(577,40,ownerFilter,CUTOFF,"Cutoff",0.4); - resonanceKnob = addNormalKnobClassic(638,40,ownerFilter,RESONANCE,"Resonance",0); - filterEnvelopeAmtKnob = addNormalKnobClassic(699,40,ownerFilter,ENVELOPE_AMT,"Envelope",0); - multimodeKnob = addTinyKnobClassic(643,106,ownerFilter,MULTIMODE,"Multimode",0.5); + cutoffKnob = addNormalKnobClassic (577, 40, ownerFilter, CUTOFF, "Cutoff", 0.4); + resonanceKnob = addNormalKnobClassic (638, 40, ownerFilter, RESONANCE, "Resonance", 0); + filterEnvelopeAmtKnob = addNormalKnobClassic (699, 40, ownerFilter, ENVELOPE_AMT, "Envelope", 0); + multimodeKnob = addTinyKnobClassic (643, 106, ownerFilter, MULTIMODE, "Multimode", 0.5); - volumeKnob = addNormalKnobClassic(53,120,ownerFilter,VOLUME,"Volume",0.4); - portamentoKnob = addNormalKnobClassic(175,241,ownerFilter,PORTAMENTO,"Portamento",0); - osc1PitchKnob = addNormalKnobClassic(271,40,ownerFilter,OSC1P,"Osc1Pitch",0); - pulseWidthKnob = addNormalKnobClassic(334,40,ownerFilter,PW,"PW",0); - osc2PitchKnob = addNormalKnobClassic(397,40,ownerFilter,OSC2P,"Osc2Pitch",0); + volumeKnob = addNormalKnobClassic (53, 120, ownerFilter, VOLUME, "Volume", 0.4); + portamentoKnob = addNormalKnobClassic (175, 241, ownerFilter, PORTAMENTO, "Portamento", 0); + osc1PitchKnob = addNormalKnobClassic (271, 40, ownerFilter, OSC1P, "Osc1Pitch", 0); + pulseWidthKnob = addNormalKnobClassic (334, 40, ownerFilter, PW, "PW", 0); + osc2PitchKnob = addNormalKnobClassic (397, 40, ownerFilter, OSC2P, "Osc2Pitch", 0); - osc1MixKnob = addNormalKnobClassic(490,40,ownerFilter,OSC1MIX,"Osc1",1); - osc2MixKnob = addNormalKnobClassic(490,132,ownerFilter,OSC2MIX,"Osc2",1); - noiseMixKnob = addNormalKnobClassic(490,224,ownerFilter,NOISEMIX,"Noise",0); + osc1MixKnob = addNormalKnobClassic (490, 40, ownerFilter, OSC1MIX, "Osc1", 1); + osc2MixKnob = addNormalKnobClassic (490, 132, ownerFilter, OSC2MIX, "Osc2", 1); + noiseMixKnob = addNormalKnobClassic (490, 224, ownerFilter, NOISEMIX, "Noise", 0); - xmodKnob = addNormalKnobClassic(334,168,ownerFilter,XMOD,"Xmod",0); - osc2DetuneKnob = addNormalKnobClassic(334,104,ownerFilter,OSC2_DET,"Detune",0); + xmodKnob = addNormalKnobClassic (334, 168, ownerFilter, XMOD, "Xmod", 0); + osc2DetuneKnob = addNormalKnobClassic (334, 104, ownerFilter, OSC2_DET, "Detune", 0); - envPitchModKnob = addNormalKnobClassic(376,232,ownerFilter,ENVPITCH,"PEnv",0); - brightnessKnob = addNormalKnobClassic(291,232,ownerFilter,BRIGHTNESS,"Bri",1); + envPitchModKnob = addNormalKnobClassic (376, 232, ownerFilter, ENVPITCH, "PEnv", 0); + brightnessKnob = addNormalKnobClassic (291, 232, ownerFilter, BRIGHTNESS, "Bri", 1); - attackKnob = addNormalKnobClassic(791,132,ownerFilter,LATK,"Atk",0); - decayKnob = addNormalKnobClassic(853,132,ownerFilter,LDEC,"Dec",0); - sustainKnob = addNormalKnobClassic(916,132,ownerFilter,LSUS,"Sus",1); - releaseKnob = addNormalKnobClassic(980,132,ownerFilter,LREL,"Rel",0); + attackKnob = addNormalKnobClassic (791, 132, ownerFilter, LATK, "Atk", 0); + decayKnob = addNormalKnobClassic (853, 132, ownerFilter, LDEC, "Dec", 0); + sustainKnob = addNormalKnobClassic (916, 132, ownerFilter, LSUS, "Sus", 1); + releaseKnob = addNormalKnobClassic (980, 132, ownerFilter, LREL, "Rel", 0); - fattackKnob = addNormalKnobClassic(791,40,ownerFilter,FATK,"Atk",0); - fdecayKnob = addNormalKnobClassic(853,40,ownerFilter,FDEC,"Dec",0); - fsustainKnob = addNormalKnobClassic(916,40,ownerFilter,FSUS,"Sus",1); - freleaseKnob = addNormalKnobClassic(980,40,ownerFilter,FREL,"Rel",0); + fattackKnob = addNormalKnobClassic (791, 40, ownerFilter, FATK, "Atk", 0); + fdecayKnob = addNormalKnobClassic (853, 40, ownerFilter, FDEC, "Dec", 0); + fsustainKnob = addNormalKnobClassic (916, 40, ownerFilter, FSUS, "Sus", 1); + freleaseKnob = addNormalKnobClassic (980, 40, ownerFilter, FREL, "Rel", 0); - lfoFrequencyKnob = addNormalKnobClassic(576,207,ownerFilter,LFOFREQ,"Freq",0); - lfoAmt1Knob = addNormalKnobClassic(640,207,ownerFilter,LFO1AMT,"Pitch",0); - lfoAmt2Knob = addNormalKnobClassic(704,207,ownerFilter,LFO2AMT,"PWM",0); + lfoFrequencyKnob = addNormalKnobClassic (576, 207, ownerFilter, LFOFREQ, "Freq", 0); + lfoAmt1Knob = addNormalKnobClassic (640, 207, ownerFilter, LFO1AMT, "Pitch", 0); + lfoAmt2Knob = addNormalKnobClassic (704, 207, ownerFilter, LFO2AMT, "PWM", 0); - lfoSinButton = addNormalTooglableButtonClassic(587,269,ownerFilter,LFOSINWAVE,"Sin"); - lfoSquareButton = addNormalTooglableButtonClassic(587,323,ownerFilter,LFOSQUAREWAVE,"SQ"); - lfoSHButton = addNormalTooglableButtonClassic(587,378,ownerFilter,LFOSHWAVE,"S&H"); + lfoSinButton = addNormalTooglableButtonClassic (587, 269, ownerFilter, LFOSINWAVE, "Sin"); + lfoSquareButton = addNormalTooglableButtonClassic (587, 323, ownerFilter, LFOSQUAREWAVE, "SQ"); + lfoSHButton = addNormalTooglableButtonClassic (587, 378, ownerFilter, LFOSHWAVE, "S&H"); - lfoOsc1Button = addNormalTooglableButtonClassic(651,269,ownerFilter,LFOOSC1,"Osc1"); - lfoOsc2Button = addNormalTooglableButtonClassic(651,323,ownerFilter,LFOOSC2,"Osc2"); - lfoFilterButton = addNormalTooglableButtonClassic(651,378,ownerFilter,LFOFILTER,"Filt"); + lfoOsc1Button = addNormalTooglableButtonClassic (651, 269, ownerFilter, LFOOSC1, "Osc1"); + lfoOsc2Button = addNormalTooglableButtonClassic (651, 323, ownerFilter, LFOOSC2, "Osc2"); + lfoFilterButton = addNormalTooglableButtonClassic (651, 378, ownerFilter, LFOFILTER, "Filt"); - lfoPwm1Button = addNormalTooglableButtonClassic(714,269,ownerFilter,LFOPW1,"Osc1"); - lfoPwm2Button = addNormalTooglableButtonClassic(714,323,ownerFilter,LFOPW2,"Osc2"); + lfoPwm1Button = addNormalTooglableButtonClassic (714, 269, ownerFilter, LFOPW1, "Osc1"); + lfoPwm2Button = addNormalTooglableButtonClassic (714, 323, ownerFilter, LFOPW2, "Osc2"); - hardSyncButton = addNormalTooglableButtonClassic(282,178,ownerFilter,OSC2HS,"Sync"); - osc1SawButton = addNormalTooglableButtonClassic(265,114,ownerFilter,OSC1Saw,"S"); - osc2SawButton = addNormalTooglableButtonClassic(394,114,ownerFilter,OSC2Saw,"S"); + hardSyncButton = addNormalTooglableButtonClassic (282, 178, ownerFilter, OSC2HS, "Sync"); + osc1SawButton = addNormalTooglableButtonClassic (265, 114, ownerFilter, OSC1Saw, "S"); + osc2SawButton = addNormalTooglableButtonClassic (394, 114, ownerFilter, OSC2Saw, "S"); - osc1PulButton = addNormalTooglableButtonClassic(296,114,ownerFilter,OSC1Pul,"P"); - osc2PulButton = addNormalTooglableButtonClassic(425,114,ownerFilter,OSC2Pul,"P"); + osc1PulButton = addNormalTooglableButtonClassic (296, 114, ownerFilter, OSC1Pul, "P"); + osc2PulButton = addNormalTooglableButtonClassic (425, 114, ownerFilter, OSC2Pul, "P"); - pitchQuantButton = addNormalTooglableButtonClassic(407,178,ownerFilter,OSCQuantize,"Step"); + pitchQuantButton = addNormalTooglableButtonClassic (407, 178, ownerFilter, OSCQuantize, "Step"); - filterBPBlendButton = addNormalTooglableButtonClassic(697,110,ownerFilter,BANDPASS,"Bp"); - fourPoleButton = addNormalTooglableButtonClassic(728,110,ownerFilter,FOURPOLE,"24"); - filterHQButton = addNormalTooglableButtonClassic(604,110,ownerFilter,FILTER_WARM,"HQ"); + filterBPBlendButton = addNormalTooglableButtonClassic (697, 110, ownerFilter, BANDPASS, "Bp"); + fourPoleButton = addNormalTooglableButtonClassic (728, 110, ownerFilter, FOURPOLE, "24"); + filterHQButton = addNormalTooglableButtonClassic (604, 110, ownerFilter, FILTER_WARM, "HQ"); - filterKeyFollowButton = addNormalTooglableButtonClassic(573,110,ownerFilter,FLT_KF,"Key"); - unisonButton = addNormalTooglableButtonClassic(125,251,ownerFilter,UNISON,"Uni"); - tuneKnob = addNormalKnobClassic(114,120,ownerFilter,TUNE,"Tune",0.5); - voiceDetuneKnob =addNormalKnobClassic(53,241,ownerFilter,UDET,"VoiceDet",0); + filterKeyFollowButton = addNormalTooglableButtonClassic (573, 110, ownerFilter, FLT_KF, "Key"); + unisonButton = addNormalTooglableButtonClassic (125, 251, ownerFilter, UNISON, "Uni"); + tuneKnob = addNormalKnobClassic (114, 120, ownerFilter, TUNE, "Tune", 0.5); + voiceDetuneKnob =addNormalKnobClassic (53, 241, ownerFilter, UDET, "VoiceDet", 0); - veloAmpEnvKnob = addNormalKnobClassic(486,345,ownerFilter,VAMPENV,"VAE",0); - veloFltEnvKnob = addNormalKnobClassic(428,345,ownerFilter,VFLTENV,"VFE",0); - midiLearnButton = addNormalTooglableButtonClassic(126,372,ownerFilter,MIDILEARN,"LEA"); - midiUnlearnButton = addNormalTooglableButtonClassic(185,372,ownerFilter,UNLEARN,"UNL"); - transposeKnob = addNormalKnobClassic(176,120,ownerFilter,OCTAVE,"Transpose",0.5); + veloAmpEnvKnob = addNormalKnobClassic (486, 345, ownerFilter, VAMPENV, "VAE", 0); + veloFltEnvKnob = addNormalKnobClassic (428, 345, ownerFilter, VFLTENV, "VFE", 0); + midiLearnButton = addNormalTooglableButtonClassic (126, 372, ownerFilter, MIDILEARN, "LEA"); + midiUnlearnButton = addNormalTooglableButtonClassic (185, 372, ownerFilter, UNLEARN, "UNL"); + transposeKnob = addNormalKnobClassic (176, 120, ownerFilter, OCTAVE, "Transpose", 0.5); - pan1Knob = addTinyKnobClassic(796,318,ownerFilter,PAN1,"1",0.5); - pan2Knob = addTinyKnobClassic(858,318,ownerFilter,PAN2,"2",0.5); - pan3Knob = addTinyKnobClassic(921,318,ownerFilter,PAN3,"3",0.5); - pan4Knob = addTinyKnobClassic(984,318,ownerFilter,PAN4,"4",0.5); + pan1Knob = addTinyKnobClassic (796, 318, ownerFilter, PAN1, "1", 0.5); + pan2Knob = addTinyKnobClassic (858, 318, ownerFilter, PAN2, "2", 0.5); + pan3Knob = addTinyKnobClassic (921, 318, ownerFilter, PAN3, "3", 0.5); + pan4Knob = addTinyKnobClassic (984, 318, ownerFilter, PAN4, "4", 0.5); - pan5Knob = addTinyKnobClassic(796,371,ownerFilter,PAN5,"5",0.5); - pan6Knob = addTinyKnobClassic(858,371,ownerFilter,PAN6,"6",0.5); - pan7Knob = addTinyKnobClassic(921,371,ownerFilter,PAN7,"7",0.5); - pan8Knob = addTinyKnobClassic(984,371,ownerFilter,PAN8,"8",0.5); + pan5Knob = addTinyKnobClassic (796, 371, ownerFilter, PAN5, "5", 0.5); + pan6Knob = addTinyKnobClassic (858, 371, ownerFilter, PAN6, "6", 0.5); + pan7Knob = addTinyKnobClassic (921, 371, ownerFilter, PAN7, "7", 0.5); + pan8Knob = addTinyKnobClassic (984, 371, ownerFilter, PAN8, "8", 0.5); - bendOsc2OnlyButton = addNormalTooglableButtonClassic(321,354,ownerFilter,BENDOSC2,"Osc2"); - bendRangeButton = addNormalTooglableButtonClassic(267,354,ownerFilter,BENDRANGE,"12"); - asPlayedAllocButton = addNormalTooglableButtonClassic(65,372,ownerFilter,ASPLAYEDALLOCATION,"APA"); + bendOsc2OnlyButton = addNormalTooglableButtonClassic (321, 354, ownerFilter, BENDOSC2, "Osc2"); + bendRangeButton = addNormalTooglableButtonClassic (267, 354, ownerFilter, BENDRANGE, "12"); + asPlayedAllocButton = addNormalTooglableButtonClassic (65, 372, ownerFilter, ASPLAYEDALLOCATION, "APA"); - filterDetuneKnob = addTinyKnobClassic(817,240,ownerFilter,FILTERDER,"Flt",0.2); - envelopeDetuneKnob = addTinyKnobClassic(963,240,ownerFilter,ENVDER,"Env",0.2); - portamentoDetuneKnob = addTinyKnobClassic(890,240,ownerFilter,PORTADER,"Port",0.2); + filterDetuneKnob = addTinyKnobClassic (817, 240, ownerFilter, FILTERDER, "Flt", 0.2); + envelopeDetuneKnob = addTinyKnobClassic (963, 240, ownerFilter, ENVDER, "Env", 0.2); + portamentoDetuneKnob = addTinyKnobClassic (890, 240, ownerFilter, PORTADER, "Port", 0.2); - bendLfoRateKnob = addNormalKnobClassic(364,345,ownerFilter,BENDLFORATE,"ModRate",0.4); + bendLfoRateKnob = addNormalKnobClassic (364, 345, ownerFilter, BENDLFORATE, "ModRate", 0.4); - voiceSwitch = addNormalButtonListClassic(172,321,38,ownerFilter,VOICE_COUNT,"VoiceCount",ImageCache::getFromFile(skinFolder.getChildFile("voices.png"))); - for (int i=1; i <= 32; i++) - voiceSwitch->addChoise(String(i)); - voiceSwitch ->setValue(ownerFilter->getParameter(VOICE_COUNT),dontSendNotification); + voiceSwitch = addNormalButtonListClassic (172, 321, 38, ownerFilter, VOICE_COUNT, "VoiceCount", ImageCache::getFromFile (skinFolder.getChildFile ("voices.png"))); + + for (int i = 1; i <= 32; ++i) + { + voiceSwitch->addChoice (String (i)); + } - legatoSwitch = addNormalButtonListClassic(65,321,95,ownerFilter,LEGATOMODE,"Legato",ImageCache::getFromFile(skinFolder.getChildFile("legato.png"))); - legatoSwitch ->addChoise("Keep all"); - legatoSwitch ->addChoise("Keep fenv"); - legatoSwitch ->addChoise("Keep aenv"); - legatoSwitch ->addChoise("Retrig"); - legatoSwitch ->setValue(ownerFilter->getParameter(LEGATOMODE),dontSendNotification); + legatoSwitch = addNormalButtonListClassic (65, 321, 95, ownerFilter, LEGATOMODE, "Legato", ImageCache::getFromFile (skinFolder.getChildFile ("legato.png"))); + legatoSwitch->addChoice ("Keep all"); + legatoSwitch->addChoice ("Keep fenv"); + legatoSwitch->addChoice ("Keep aenv"); + legatoSwitch->addChoice ("Retrig"); } - - ownerFilter->addChangeListener(this); - + + buttonListAttachments.add (new ButtonList::ButtonListAttachment (ownerFilter.getPluginState(), + ownerFilter.getEngineParameterId (VOICE_COUNT), + *voiceSwitch)); + + buttonListAttachments.add (new ButtonList::ButtonListAttachment (ownerFilter.getPluginState(), + ownerFilter.getEngineParameterId (LEGATOMODE), + *legatoSwitch)); + + ownerFilter.addChangeListener (this); repaint(); } -void ObxdAudioProcessorEditor::buttonClicked(Button * b) -{ - TooglableButton* tb = (TooglableButton*)(b); - ObxdAudioProcessor* flt = getFilter(); -#define bp(T) {flt->setParameterNotifyingHost(T,tb->getValue());} -#define handleBParam(K,T) if (tb == K) {bp(T)} else - handleBParam(hardSyncButton,OSC2HS) - handleBParam(osc1SawButton,OSC1Saw) - handleBParam(osc2SawButton,OSC2Saw) - handleBParam(osc1PulButton,OSC1Pul) - handleBParam(osc2PulButton,OSC2Pul) - handleBParam(filterKeyFollowButton,FLT_KF) - handleBParam(pitchQuantButton,OSCQuantize) - handleBParam(unisonButton,UNISON) - handleBParam(filterHQButton,FILTER_WARM) - handleBParam(filterBPBlendButton,BANDPASS) +//void ObxdAudioProcessorEditor::buttonClicked(Button * b) +//{ +//} - handleBParam(lfoSinButton,LFOSINWAVE) - handleBParam(lfoSquareButton,LFOSQUAREWAVE) - handleBParam(lfoSHButton,LFOSHWAVE) +//void ObxdAudioProcessorEditor::comboBoxChanged (ComboBox* cb) +//{ +// ButtonList* bl = (ButtonList*)(cb); +// ObxdAudioProcessor* flt = getFilter(); +// #define cp(T) {flt->setParameterNotifyingHost(T,bl->getValue());} +//#define handleCParam(K,T) if (bl == K) {cp(T)} else +// handleCParam(voiceSwitch,VOICE_COUNT) +// handleCParam(legatoSwitch,LEGATOMODE) +// {}; +//} - handleBParam(lfoOsc1Button,LFOOSC1) - handleBParam(lfoOsc2Button,LFOOSC2) - handleBParam(lfoFilterButton,LFOFILTER) - handleBParam(lfoPwm1Button,LFOPW1) - handleBParam(lfoPwm2Button,LFOPW2) - handleBParam(bendOsc2OnlyButton,BENDOSC2) - handleBParam(bendRangeButton,BENDRANGE) - handleBParam(fourPoleButton,FOURPOLE) - handleBParam(asPlayedAllocButton,ASPLAYEDALLOCATION) - handleBParam(midiLearnButton,MIDILEARN) - handleBParam(midiUnlearnButton,UNLEARN) - {}; - -} - -void ObxdAudioProcessorEditor::comboBoxChanged (ComboBox* cb) -{ - ButtonList* bl = (ButtonList*)(cb); - ObxdAudioProcessor* flt = getFilter(); - #define cp(T) {flt->setParameterNotifyingHost(T,bl->getValue());} -#define handleCParam(K,T) if (bl == K) {cp(T)} else - handleCParam(voiceSwitch,VOICE_COUNT) - handleCParam(legatoSwitch,LEGATOMODE) - {}; -} - -void ObxdAudioProcessorEditor::sliderValueChanged (Slider* c) -{ - ObxdAudioProcessor* flt = getFilter(); - // flt->beginParameterChangeGesture(); -#define sp(T) {flt->setParameterNotifyingHost(T,c->getValue());} -#define handleSParam(K,T) if (c == K) {sp(T)} else - handleSParam(cutoffKnob,CUTOFF) - handleSParam(resonanceKnob,RESONANCE) - handleSParam(volumeKnob,VOLUME) - handleSParam(osc1PitchKnob,OSC1P) - handleSParam(osc2PitchKnob,OSC2P) - handleSParam(osc2DetuneKnob,OSC2_DET) - handleSParam(portamentoKnob,PORTAMENTO) - handleSParam(filterEnvelopeAmtKnob,ENVELOPE_AMT) - handleSParam(pulseWidthKnob,PW) - handleSParam(xmodKnob,XMOD) - handleSParam(multimodeKnob,MULTIMODE) - - handleSParam(attackKnob,LATK) - handleSParam(decayKnob,LDEC) - handleSParam(sustainKnob,LSUS) - handleSParam(releaseKnob,LREL) - - handleSParam(fattackKnob,FATK) - handleSParam(fdecayKnob,FDEC) - handleSParam(fsustainKnob,FSUS) - handleSParam(freleaseKnob,FREL) - - handleSParam(osc1MixKnob,OSC1MIX) - handleSParam(osc2MixKnob,OSC2MIX) - handleSParam(noiseMixKnob,NOISEMIX) - handleSParam(voiceDetuneKnob,UDET) - - handleSParam(filterDetuneKnob,FILTERDER) - handleSParam(envelopeDetuneKnob,ENVDER) - handleSParam(portamentoDetuneKnob,PORTADER) - - handleSParam(lfoFrequencyKnob,LFOFREQ) - handleSParam(lfoAmt1Knob,LFO1AMT) - handleSParam(lfoAmt2Knob,LFO2AMT) - - handleSParam(pan1Knob,PAN1) - handleSParam(pan2Knob,PAN2) - handleSParam(pan3Knob,PAN3) - handleSParam(pan4Knob,PAN4) - handleSParam(pan5Knob,PAN5) - handleSParam(pan6Knob,PAN6) - handleSParam(pan7Knob,PAN7) - handleSParam(pan8Knob,PAN8) - - handleSParam(tuneKnob,TUNE) - handleSParam(brightnessKnob,BRIGHTNESS) - handleSParam(envPitchModKnob,ENVPITCH) - - handleSParam(bendLfoRateKnob,BENDLFORATE) - handleSParam(veloAmpEnvKnob,VAMPENV) - handleSParam(veloFltEnvKnob,VFLTENV) - handleSParam(transposeKnob,OCTAVE) - //magic crystal - {}; - - //else if(c == cutoffKnob) - //{sp(CUTOFF);} - //else if(c == resonanceKnob) - //{sp(RESONANCE);} - //else if(c == portamentoKnob) - //{sp(PORTAMENTO);} - //else if(c == volumeKnob) - //{sp(VOLUME);} - //else if(c == osc1PitchKnob) - //{sp(OSC1P);} - //else if (c == osc2PitchKnob) - //{sp(OSC2P);} -} +//void ObxdAudioProcessorEditor::sliderValueChanged (Slider* c) +//{ +//} //============================================================================== void ObxdAudioProcessorEditor::changeListenerCallback (ChangeBroadcaster* source) { - ObxdAudioProcessor* filter = getFilter(); - - float pr[PARAM_COUNT]; - filter->getCallbackLock().enter(); - for(int i = 0 ; i < PARAM_COUNT;++i) - pr[i] = filter->getPrograms().currentProgramPtr->values[i]; - filter->getCallbackLock().exit(); -#define rn(T,P) (T->setValue(pr[P],dontSendNotification)); - rn(cutoffKnob,CUTOFF) - rn(resonanceKnob,RESONANCE) - rn(volumeKnob,VOLUME) - rn(osc1PitchKnob,OSC1P) - rn(osc2PitchKnob,OSC2P) - rn(osc2DetuneKnob,OSC2_DET) - rn(portamentoKnob,PORTAMENTO) - rn(filterEnvelopeAmtKnob,ENVELOPE_AMT) - rn(pulseWidthKnob,PW) - rn(xmodKnob,XMOD) - rn(multimodeKnob,MULTIMODE) - rn(brightnessKnob,BRIGHTNESS) - rn(envPitchModKnob,ENVPITCH) - - rn(attackKnob,LATK) - rn(decayKnob,LDEC) - rn(sustainKnob,LSUS) - rn(releaseKnob,LREL) - - rn(fattackKnob,FATK) - rn(fdecayKnob,FDEC) - rn(fsustainKnob,FSUS) - rn(freleaseKnob,FREL) - - rn(osc1MixKnob,OSC1MIX) - rn(osc2MixKnob,OSC2MIX) - rn(noiseMixKnob,NOISEMIX) - rn(voiceDetuneKnob,UDET) - - rn(lfoFrequencyKnob,LFOFREQ) - rn(lfoAmt1Knob,LFO1AMT) - rn(lfoAmt2Knob,LFO2AMT) - rn(tuneKnob,TUNE) - rn(bendLfoRateKnob,BENDLFORATE) - rn(veloAmpEnvKnob,VAMPENV) - rn(veloFltEnvKnob,VFLTENV) - //buttons - rn(hardSyncButton,OSC2HS) - rn(osc1SawButton,OSC1Saw) - rn(osc2SawButton,OSC2Saw) - rn(osc1PulButton,OSC1Pul) - rn(osc2PulButton,OSC2Pul) - - rn(filterKeyFollowButton,FLT_KF) - rn(pitchQuantButton,OSCQuantize) - rn(unisonButton,UNISON) - - rn(filterDetuneKnob,FILTERDER) - rn(envelopeDetuneKnob,ENVDER) - rn(portamentoDetuneKnob,PORTADER) - - rn(filterHQButton,FILTER_WARM) - rn(filterBPBlendButton,BANDPASS) - rn(lfoSinButton,LFOSINWAVE) - rn(lfoSquareButton,LFOSQUAREWAVE) - rn(lfoSHButton,LFOSHWAVE) - - rn(bendOsc2OnlyButton,BENDOSC2) - rn(bendRangeButton,BENDRANGE) - - rn(lfoOsc1Button,LFOOSC1) - rn(lfoOsc2Button,LFOOSC2) - rn(lfoFilterButton,LFOFILTER) - rn(lfoPwm1Button,LFOPW1) - rn(lfoPwm2Button,LFOPW2) - rn(fourPoleButton,FOURPOLE) - - rn(transposeKnob,OCTAVE) - - rn(pan1Knob,PAN1) - rn(pan2Knob,PAN2) - rn(pan3Knob,PAN3) - rn(pan4Knob,PAN4) - rn(pan5Knob,PAN5) - rn(pan6Knob,PAN6) - rn(pan7Knob,PAN7) - rn(pan8Knob,PAN8) - - rn(voiceSwitch,VOICE_COUNT) - rn(legatoSwitch,LEGATOMODE) - rn(asPlayedAllocButton,ASPLAYEDALLOCATION) - rn(midiLearnButton,MIDILEARN) - rn(midiUnlearnButton,UNLEARN) + repaint(); } void ObxdAudioProcessorEditor::mouseUp(const MouseEvent& e) @@ -639,11 +486,11 @@ void ObxdAudioProcessorEditor::mouseUp(const MouseEvent& e) PopupMenu progMenu; Array skins; - const Array& banks = getFilter()->getBankFiles(); + const Array& banks = processor.getBankFiles(); int skinStart = 0; { - DirectoryIterator it(getFilter()->getSkinFolder(), false, "*", File::findDirectories); + DirectoryIterator it(processor.getSkinFolder(), false, "*", File::findDirectories); while (it.next()) { skins.addUsingDefaultSort(it.getFile()); @@ -660,7 +507,7 @@ void ObxdAudioProcessorEditor::mouseUp(const MouseEvent& e) int bankStart = 1000; { - const String currentBank = getFilter()->getCurrentBankFile().getFileName(); + const String currentBank = processor.getCurrentBankFile().getFileName(); for (int i = 0; i < banks.size(); ++i) { @@ -690,9 +537,9 @@ void ObxdAudioProcessorEditor::mouseUp(const MouseEvent& e) result -= skinStart; const File newSkinFolder = skins.getUnchecked(result); - getFilter()->setCurrentSkinFolder(newSkinFolder.getFileName()); + processor.setCurrentSkinFolder(newSkinFolder.getFileName()); - rebuildComponents(); + rebuildComponents (processor); } else if (result >= (bankStart + 1) && result <= (bankStart + banks.size())) { @@ -700,13 +547,13 @@ void ObxdAudioProcessorEditor::mouseUp(const MouseEvent& e) result -= bankStart; const File bankFile = banks.getUnchecked(result); - getFilter()->loadFromFXBFile(bankFile); + processor.loadFromFXBFile (bankFile); } else if (result >= (progStart + 1) && result <= (progStart + processor.getNumPrograms())) { result -= 1; result -= progStart; - processor.setCurrentProgram(result); + processor.setCurrentProgram (result); } } } diff --git a/Source/PluginEditor.h b/Source/PluginEditor.h index 100f11c..ae79739 100755 --- a/Source/PluginEditor.h +++ b/Source/PluginEditor.h @@ -22,45 +22,44 @@ //============================================================================== /** */ -class ObxdAudioProcessorEditor : - public AudioProcessorEditor, - // public AudioProcessorListener, - public ChangeListener, - public Slider::Listener, - public Button::Listener, - public ComboBox::Listener +class ObxdAudioProcessorEditor : public AudioProcessorEditor, +// public AudioProcessorListener, + public ChangeListener//, +// public Slider::Listener, +// public Button::Listener, +// public ComboBox::Listener { public: - ObxdAudioProcessorEditor(ObxdAudioProcessor* ownerFilter); + ObxdAudioProcessorEditor(ObxdAudioProcessor& ownerFilter); ~ObxdAudioProcessorEditor(); - void mouseUp(const MouseEvent& e); - void paint(Graphics& g); + void mouseUp (const MouseEvent& e) override; + void paint (Graphics& g) override; //============================================================================== - void changeListenerCallback (ChangeBroadcaster* source); + void changeListenerCallback (ChangeBroadcaster* source) override; private: - Knob* addNormalKnob(int x , int y ,ObxdAudioProcessor* filter, int parameter,String name,float defval); - Knob* addTinyKnob(int x , int y ,ObxdAudioProcessor* filter, int parameter,String name,float defval); - void placeLabel(int x , int y,String text); - TooglableButton* addNormalTooglableButton(int x , int y , ObxdAudioProcessor* filter,int parameter,String name); - TooglableButton* addTinyTooglableButton(int x , int y , ObxdAudioProcessor* filter,int parameter,String name); + Knob* addNormalKnob (int x, int y, ObxdAudioProcessor& filter, int parameter, String name, float defval); + Knob* addTinyKnob (int x, int y, ObxdAudioProcessor& filter, int parameter, String name, float defval); + void placeLabel (int x, int y, String text); + TooglableButton* addNormalTooglableButton (int x, int y, ObxdAudioProcessor& filter, int parameter, String name); + TooglableButton* addTinyTooglableButton (int x, int y, ObxdAudioProcessor& filter, int parameter, String name); - ButtonList* addNormalButtonList(int x , int y ,int width, ObxdAudioProcessor* filter,int parameter,String name,Image img); - void sliderValueChanged (Slider*); - void buttonClicked (Button *); - void comboBoxChanged(ComboBox*); + ButtonList* addNormalButtonList(int x, int y, int width, ObxdAudioProcessor& filter, int parameter, String name, Image img); +// void sliderValueChanged (Slider*) override; +// void buttonClicked (Button*) override; +// void comboBoxChanged (ComboBox*) override; - Knob* addNormalKnobClassic(int x , int y ,ObxdAudioProcessor* filter, int parameter,String name,float defval); - Knob* addTinyKnobClassic(int x , int y ,ObxdAudioProcessor* filter, int parameter,String name,float defval); - TooglableButton* addNormalTooglableButtonClassic(int x , int y , ObxdAudioProcessor* filter,int parameter,String name); - ButtonList* addNormalButtonListClassic(int x , int y ,int width, ObxdAudioProcessor* filter,int parameter,String name,Image img); + Knob* addNormalKnobClassic (int x, int y, ObxdAudioProcessor& filter, int parameter, String name, float defval); + Knob* addTinyKnobClassic (int x, int y, ObxdAudioProcessor& filter, int parameter, String name, float defval); + TooglableButton* addNormalTooglableButtonClassic (int x, int y, ObxdAudioProcessor& filter, int parameter, String name); + ButtonList* addNormalButtonListClassic (int x, int y, int width, ObxdAudioProcessor& filter, int parameter, String name, Image img); - void rebuildComponents(); + void rebuildComponents (ObxdAudioProcessor&); //============================================================================== - ObxdAudioProcessor* getFilter() noexcept { return (ObxdAudioProcessor*)getAudioProcessor();} + ObxdAudioProcessor& processor; //============================================================================== Knob* cutoffKnob,*resonanceKnob,*osc1PitchKnob,*osc2PitchKnob,*osc2DetuneKnob,*volumeKnob, @@ -83,6 +82,11 @@ private: ButtonList *voiceSwitch,*legatoSwitch; File skinFolder; + + //============================================================================== + OwnedArray knobAttachments; + OwnedArray toggleAttachments; + OwnedArray buttonListAttachments; }; #endif // PLUGINEDITOR_H_INCLUDED diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp index c092fdd..4367f73 100755 --- a/Source/PluginProcessor.cpp +++ b/Source/PluginProcessor.cpp @@ -27,36 +27,67 @@ It contains the basic startup code for a Juce application. //============================================================================== #define S(T) (juce::String(T)) +//============================================================================== +AudioProcessorValueTreeState::ParameterLayout createParameterLayout() +{ + ObxdParams defaultParams; + std::vector> params; + + for (int i = 0; i < PARAM_COUNT; ++i) + { + auto id = ObxdAudioProcessor::getEngineParameterId (i); + auto name = TRANS (id); + auto range = NormalisableRange {0.0f, 1.0f}; + auto defaultValue = defaultParams.values[i]; + auto parameter = std::make_unique (id, + name, + range, + defaultValue); + + params.push_back (std::move (parameter)); + } + + return { params.begin(), params.end() }; +} + //============================================================================== ObxdAudioProcessor::ObxdAudioProcessor() : bindings() , programs() , configLock("__" JucePlugin_Name "ConfigLock__") + , apvtState (*this, &undoManager, "PARAMETERS", createParameterLayout()) { isHostAutomatedChange = true; midiControlledParamSet = false; lastMovedController = 0; lastUsedParameter = 0; - synth.setSampleRate(44100); + synth.setSampleRate (44100); PropertiesFile::Options options; options.applicationName = JucePlugin_Name; options.storageFormat = PropertiesFile::storeAsXML; options.millisecondsBeforeSaving = 2500; options.processLock = &configLock; - config = new PropertiesFile(getDocumentFolder().getChildFile("Settings.xml"), options); + config = std::unique_ptr (new PropertiesFile (getDocumentFolder().getChildFile ("Settings.xml"), options)); currentSkin = config->containsKey("skin") ? config->getValue("skin") : "discoDSP Blue"; currentBank = "Init"; scanAndUpdateBanks(); - initAllParams(); + initAllParams(); if (bankFiles.size() > 0) { - loadFromFXBFile(bankFiles[0]); + loadFromFXBFile (bankFiles[0]); } + + for (int i = 0; i < PARAM_COUNT; ++i) + { + apvtState.addParameterListener (getEngineParameterId (i), this); + } + + apvtState.state = ValueTree (JucePlugin_Name); } ObxdAudioProcessor::~ObxdAudioProcessor() @@ -68,438 +99,10 @@ ObxdAudioProcessor::~ObxdAudioProcessor() //============================================================================== void ObxdAudioProcessor::initAllParams() { - for (int i = 0 ; i < PARAM_COUNT; i++) - { - setParameter(i, programs.currentProgramPtr->values[i]); - } -} - -//============================================================================== -int ObxdAudioProcessor::getNumParameters() -{ - return PARAM_COUNT; -} - -float ObxdAudioProcessor::getParameter (int index) -{ - return programs.currentProgramPtr->values[index]; -} - -void ObxdAudioProcessor::setParameter (int index, float newValue) -{ - if(!midiControlledParamSet || index==MIDILEARN || index==UNLEARN) - lastUsedParameter = index; - programs.currentProgramPtr->values[index] = newValue; - switch(index) - { - case SELF_OSC_PUSH: - synth.processSelfOscPush(newValue); - break; - case PW_ENV_BOTH: - synth.processPwEnvBoth(newValue); - break; - case PW_OSC2_OFS: - synth.processPwOfs(newValue); - break; - case ENV_PITCH_BOTH: - synth.processPitchModBoth(newValue); - break; - case FENV_INVERT: - synth.processInvertFenv(newValue); - break; - case LEVEL_DIF: - synth.processLoudnessDetune(newValue); - break; - case PW_ENV: - synth.processPwEnv(newValue); - break; - case LFO_SYNC: - synth.procLfoSync(newValue); - break; - case ECONOMY_MODE: - synth.procEconomyMode(newValue); - break; - case VAMPENV: - synth.procAmpVelocityAmount(newValue); - break; - case VFLTENV: - synth.procFltVelocityAmount(newValue); - break; - case ASPLAYEDALLOCATION: - synth.procAsPlayedAlloc(newValue); - break; - case BENDLFORATE: - synth.procModWheelFrequency(newValue); - break; - case FOURPOLE: - synth.processFourPole(newValue); - break; - case LEGATOMODE: - synth.processLegatoMode(newValue); - break; - case ENVPITCH: - synth.processEnvelopeToPitch(newValue); - break; - case OSCQuantize: - synth.processPitchQuantization(newValue); - break; - case VOICE_COUNT: - synth.setVoiceCount(newValue); - break; - case BANDPASS: - synth.processBandpassSw(newValue); - break; - case FILTER_WARM: - synth.processOversampling(newValue); - break; - case BENDOSC2: - synth.procPitchWheelOsc2Only(newValue); - break; - case BENDRANGE: - synth.procPitchWheelAmount(newValue); - break; - case NOISEMIX: - synth.processNoiseMix(newValue); - break; - case OCTAVE: - synth.processOctave(newValue); - break; - case TUNE: - synth.processTune(newValue); - break; - case BRIGHTNESS: - synth.processBrightness(newValue); - break; - case MULTIMODE: - synth.processMultimode(newValue); - break; - case LFOFREQ: - synth.processLfoFrequency(newValue); - break; - case LFO1AMT: - synth.processLfoAmt1(newValue); - break; - case LFO2AMT: - synth.processLfoAmt2(newValue); - break; - case LFOSINWAVE: - synth.processLfoSine(newValue); - break; - case LFOSQUAREWAVE: - synth.processLfoSquare(newValue); - break; - case LFOSHWAVE: - synth.processLfoSH(newValue); - break; - case LFOFILTER: - synth.processLfoFilter(newValue); - break; - case LFOOSC1: - synth.processLfoOsc1(newValue); - break; - case LFOOSC2: - synth.processLfoOsc2(newValue); - break; - case LFOPW1: - synth.processLfoPw1(newValue); - break; - case LFOPW2: - synth.processLfoPw2(newValue); - break; - case PORTADER: - synth.processPortamentoDetune(newValue); - break; - case FILTERDER: - synth.processFilterDetune(newValue); - break; - case ENVDER: - synth.processEnvelopeDetune(newValue); - break; - case XMOD: - synth.processOsc2Xmod(newValue); - break; - case OSC2HS: - synth.processOsc2HardSync(newValue); - break; - case OSC2P: - synth.processOsc2Pitch(newValue); - break; - case OSC1P: - synth.processOsc1Pitch(newValue); - break; - case PORTAMENTO: - synth.processPortamento(newValue); - break; - case UNISON: - synth.processUnison(newValue); - break; - case FLT_KF: - synth.processFilterKeyFollow(newValue); - break; - case OSC1MIX: - synth.processOsc1Mix(newValue); - break; - case OSC2MIX: - synth.processOsc2Mix(newValue); - break; - case PW: - synth.processPulseWidth(newValue); - break; - case OSC1Saw: - synth.processOsc1Saw(newValue); - break; - case OSC2Saw: - synth.processOsc2Saw(newValue); - break; - case OSC1Pul: - synth.processOsc1Pulse(newValue); - break; - case OSC2Pul: - synth.processOsc2Pulse(newValue); - break; - case VOLUME: - synth.processVolume(newValue); - break; - case UDET: - synth.processDetune(newValue); - break; - case OSC2_DET: - synth.processOsc2Det(newValue); - break; - case CUTOFF: - synth.processCutoff(newValue); - break; - case RESONANCE: - synth.processResonance(newValue); - break; - case ENVELOPE_AMT: - synth.processFilterEnvelopeAmt(newValue); - break; - case LATK: - synth.processLoudnessEnvelopeAttack(newValue); - break; - case LDEC: - synth.processLoudnessEnvelopeDecay(newValue); - break; - case LSUS: - synth.processLoudnessEnvelopeSustain(newValue); - break; - case LREL: - synth.processLoudnessEnvelopeRelease(newValue); - break; - case FATK: - synth.processFilterEnvelopeAttack(newValue); - break; - case FDEC: - synth.processFilterEnvelopeDecay(newValue); - break; - case FSUS: - synth.processFilterEnvelopeSustain(newValue); - break; - case FREL: - synth.processFilterEnvelopeRelease(newValue); - break; - case PAN1: - synth.processPan(newValue,1); - break; - case PAN2: - synth.processPan(newValue,2); - break; - case PAN3: - synth.processPan(newValue,3); - break; - case PAN4: - synth.processPan(newValue,4); - break; - case PAN5: - synth.processPan(newValue,5); - break; - case PAN6: - synth.processPan(newValue,6); - break; - case PAN7: - synth.processPan(newValue,7); - break; - case PAN8: - synth.processPan(newValue,8); - break; - } - //DIRTY HACK - //This should be checked to avoid stalling on gui update - //It is needed because some hosts do wierd stuff - if(isHostAutomatedChange) - sendChangeMessage(); -} - -const String ObxdAudioProcessor::getParameterName (int index) -{ - switch(index) - { - case SELF_OSC_PUSH: - return S("SelfOscPush"); - case ENV_PITCH_BOTH: - return S("EnvPitchBoth"); - case FENV_INVERT: - return S("FenvInvert"); - case PW_OSC2_OFS: - return S("PwOfs"); - case LEVEL_DIF: - return S("LevelDif"); - case PW_ENV_BOTH: - return S("PwEnvBoth"); - case PW_ENV: - return S("PwEnv"); - case LFO_SYNC: - return S("LfoSync"); - case ECONOMY_MODE: - return S("EconomyMode"); - case UNLEARN: - return S("MidiUnlearn"); - case MIDILEARN: - return S("MidiLearn"); - case VAMPENV: - return S("VAmpFactor"); - case VFLTENV: - return S("VFltFactor"); - case ASPLAYEDALLOCATION: - return S("AsPlayedAllocation"); - case BENDLFORATE: - return S("VibratoRate"); - case FOURPOLE: - return S("FourPole"); - case LEGATOMODE: - return S("LegatoMode"); - case ENVPITCH: - return S("EnvelopeToPitch"); - case OSCQuantize: - return S("PitchQuant"); - case VOICE_COUNT: - return S("VoiceCount"); - case BANDPASS: - return S("BandpassBlend"); - case FILTER_WARM: - return S("Filter_Warm"); - case BENDRANGE: - return S("BendRange"); - case BENDOSC2: - return S("BendOsc2Only"); - case OCTAVE: - return S("Octave"); - case TUNE: - return S("Tune"); - case BRIGHTNESS: - return S("Brightness"); - case NOISEMIX: - return S("NoiseMix"); - case OSC1MIX: - return S("Osc1Mix"); - case OSC2MIX: - return S("Osc2Mix"); - case MULTIMODE: - return S("Multimode"); - case LFOSHWAVE: - return S("LfoSampleHoldWave"); - case LFOSINWAVE: - return S("LfoSineWave"); - case LFOSQUAREWAVE: - return S("LfoSquareWave"); - case LFO1AMT: - return S("LfoAmount1"); - case LFO2AMT: - return S("LfoAmount2"); - case LFOFILTER: - return S("LfoFilter"); - case LFOOSC1: - return S("LfoOsc1"); - case LFOOSC2: - return S("LfoOsc2"); - case LFOFREQ: - return S("LfoFrequency"); - case LFOPW1: - return S("LfoPw1"); - case LFOPW2: - return S("LfoPw2"); - case PORTADER: - return S("PortamentoDetune"); - case FILTERDER: - return S("FilterDetune"); - case ENVDER: - return S("EnvelopeDetune"); - case PAN1: - return S("Pan1"); - case PAN2: - return S("Pan2"); - case PAN3: - return S("Pan3"); - case PAN4: - return S("Pan4"); - case PAN5: - return S("Pan5"); - case PAN6: - return S("Pan6"); - case PAN7: - return S("Pan7"); - case PAN8: - return S("Pan8"); - case XMOD: - return S("Xmod"); - case OSC2HS: - return S("Osc2HardSync"); - case OSC1P: - return S("Osc1Pitch"); - case OSC2P: - return S("Osc2Pitch"); - case PORTAMENTO: - return S("Portamento"); - case UNISON: - return S("Unison"); - case FLT_KF: - return S("FilterKeyFollow"); - case PW: - return S("PulseWidth"); - case OSC2Saw: - return S("Osc2Saw"); - case OSC1Saw: - return S("Osc1Saw"); - case OSC1Pul: - return S("Osc1Pulse"); - case OSC2Pul: - return S("Osc2Pulse"); - case VOLUME: - return S("Volume"); - case UDET: - return S("VoiceDetune"); - case OSC2_DET: - return S("Oscillator2detune"); - case CUTOFF: - return S("Cutoff"); - case RESONANCE: - return S("Resonance"); - case ENVELOPE_AMT: - return S("FilterEnvAmount"); - case LATK: - return S("Attack"); - case LDEC: - return S("Decay"); - case LSUS: - return S("Sustain"); - case LREL: - return S("Release"); - case FATK: - return S("FilterAttack"); - case FDEC: - return S("FilterDecay"); - case FSUS: - return S("FilterSustain"); - case FREL: - return S("FilterRelease"); - } - return {}; -} - -const String ObxdAudioProcessor::getParameterText (int index) -{ - return String(programs.currentProgramPtr->values[index],2); + for (int i = 0; i < PARAM_COUNT; ++i) + { + setEngineParameterValue (i, programs.currentProgramPtr->values[i]); + } } //============================================================================== @@ -546,11 +149,6 @@ bool ObxdAudioProcessor::producesMidi() const #endif } -bool ObxdAudioProcessor::silenceInProducesSilenceOut() const -{ - return false; -} - double ObxdAudioProcessor::getTailLengthSeconds() const { return 0.0; @@ -572,8 +170,10 @@ void ObxdAudioProcessor::setCurrentProgram (int index) programs.currentProgram = index; programs.currentProgramPtr = programs.programs + programs.currentProgram; isHostAutomatedChange = false; - for(int i = 0 ; i < PARAM_COUNT;i++) - setParameter(i,programs.currentProgramPtr->values[i]); + + for (int i = 0; i < PARAM_COUNT; ++i) + setEngineParameterValue (i, programs.currentProgramPtr->values[i]); + isHostAutomatedChange = true; sendChangeMessage(); updateHostDisplay(); @@ -590,59 +190,64 @@ void ObxdAudioProcessor::changeProgramName (int index, const String& newName) } //============================================================================== -void ObxdAudioProcessor::prepareToPlay (double sampleRate, int samplesPerBlock) +void ObxdAudioProcessor::prepareToPlay (double sampleRate, int /*samplesPerBlock*/) { // Use this method as the place to do any pre-playback // initialisation that you need.. - nextMidi= new MidiMessage(0xF0); - midiMsg = new MidiMessage(0xF0); - synth.setSampleRate(sampleRate); + nextMidi = new MidiMessage (0xF0); + midiMsg = new MidiMessage (0xF0); + synth.setSampleRate (sampleRate); } void ObxdAudioProcessor::releaseResources() { - } -inline void ObxdAudioProcessor::processMidiPerSample(MidiBuffer::Iterator* iter,const int samplePos) +inline void ObxdAudioProcessor::processMidiPerSample (MidiBuffer::Iterator* iter, const int samplePos) { - while (getNextEvent(iter, samplePos)) + while (getNextEvent (iter, samplePos)) { - if(midiMsg->isNoteOn()) + if (midiMsg->isNoteOn()) { - synth.procNoteOn(midiMsg->getNoteNumber(),midiMsg->getFloatVelocity()); + synth.procNoteOn (midiMsg->getNoteNumber(), midiMsg->getFloatVelocity()); } if (midiMsg->isNoteOff()) { - synth.procNoteOff(midiMsg->getNoteNumber()); + synth.procNoteOff (midiMsg->getNoteNumber()); } - if(midiMsg->isPitchWheel()) + if (midiMsg->isPitchWheel()) { // [0..16383] center = 8192; - synth.procPitchWheel((midiMsg->getPitchWheelValue()-8192) / 8192.0); + synth.procPitchWheel ((midiMsg->getPitchWheelValue() - 8192) / 8192.0f); } - if(midiMsg->isController() && midiMsg->getControllerNumber()==1) - synth.procModWheel(midiMsg->getControllerValue() / 127.0); - if(midiMsg->isController()) + if (midiMsg->isController() && midiMsg->getControllerNumber() == 1) + { + synth.procModWheel (midiMsg->getControllerValue() / 127.0f); + } + if (midiMsg->isController()) { lastMovedController = midiMsg->getControllerNumber(); - if(programs.currentProgramPtr->values[MIDILEARN] > 0.5) + + if (programs.currentProgramPtr->values[MIDILEARN] > 0.5f) bindings.controllers[lastMovedController] = lastUsedParameter; - if(programs.currentProgramPtr->values[UNLEARN] >0.5) + + if (programs.currentProgramPtr->values[UNLEARN] > 0.5f) { midiControlledParamSet = true; bindings.controllers[lastMovedController] = 0; - setParameter(UNLEARN,0); + setEngineParameterValue (UNLEARN, 0); lastMovedController = 0; lastUsedParameter = 0; midiControlledParamSet = false; } - if(bindings.controllers[lastMovedController] > 0) + if (bindings.controllers[lastMovedController] > 0) { midiControlledParamSet = true; - setParameter(bindings.controllers[lastMovedController],midiMsg->getControllerValue() / 127.0); - setParameter(MIDILEARN,0); + setEngineParameterValue (bindings.controllers[lastMovedController], + midiMsg->getControllerValue() / 127.0f); + + setEngineParameterValue (MIDILEARN, 0); lastMovedController = 0; lastUsedParameter = 0; @@ -670,14 +275,15 @@ inline void ObxdAudioProcessor::processMidiPerSample(MidiBuffer::Iterator* iter, } } -bool ObxdAudioProcessor::getNextEvent(MidiBuffer::Iterator* iter,const int samplePos) +bool ObxdAudioProcessor::getNextEvent (MidiBuffer::Iterator* iter, const int samplePos) { if (hasMidiMessage && midiEventPos <= samplePos) { *midiMsg = *nextMidi; - hasMidiMessage = iter->getNextEvent(*nextMidi, midiEventPos); + hasMidiMessage = iter->getNextEvent (*nextMidi, midiEventPos); return true; - } + } + return false; } @@ -691,27 +297,26 @@ void ObxdAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuffer& mi // _MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON); #endif - MidiBuffer::Iterator ppp(midiMessages); - hasMidiMessage = ppp.getNextEvent(*nextMidi,midiEventPos); + MidiBuffer::Iterator ppp (midiMessages); + hasMidiMessage = ppp.getNextEvent (*nextMidi, midiEventPos); int samplePos = 0; int numSamples = buffer.getNumSamples(); - float* channelData1 = buffer.getWritePointer(0); - float* channelData2 = buffer.getWritePointer(1); + float* channelData1 = buffer.getWritePointer (0); + float* channelData2 = buffer.getWritePointer (1); AudioPlayHead::CurrentPositionInfo pos; + if (getPlayHead() != 0 && getPlayHead()->getCurrentPosition (pos)) { - synth.setPlayHead(pos.bpm,pos.ppqPosition); + synth.setPlayHead(pos.bpm, pos.ppqPosition); } while (samplePos < numSamples) { - processMidiPerSample(&ppp,samplePos); - - synth.processSample(channelData1+samplePos,channelData2+samplePos); - - samplePos++; + processMidiPerSample (&ppp, samplePos); + synth.processSample (channelData1+samplePos, channelData2+samplePos); + ++samplePos; } } @@ -723,13 +328,13 @@ bool ObxdAudioProcessor::hasEditor() const AudioProcessorEditor* ObxdAudioProcessor::createEditor() { - return new ObxdAudioProcessorEditor (this); + return new ObxdAudioProcessorEditor (*this); } //============================================================================== void ObxdAudioProcessor::getStateInformation(MemoryBlock& destData) { - XmlElement xmlState = XmlElement("Datsounds"); + XmlElement xmlState = XmlElement("discoDSP"); xmlState.setAttribute(S("currentProgram"), programs.currentProgram); XmlElement* xprogs = new XmlElement("programs"); @@ -741,7 +346,7 @@ void ObxdAudioProcessor::getStateInformation(MemoryBlock& destData) for (int k = 0; k < PARAM_COUNT; ++k) { - xpr->setAttribute(String(k), programs.programs[i].values[k]); + xpr->setAttribute(String(k), programs.programs[i].values[k]); } xprogs->addChildElement(xpr); @@ -751,7 +356,7 @@ void ObxdAudioProcessor::getStateInformation(MemoryBlock& destData) for (int i = 0; i < 255; ++i) { - xmlState.setAttribute(String(i), bindings.controllers[i]); + xmlState.setAttribute(String(i), bindings.controllers[i]); } copyXmlToBinary(xmlState, destData); @@ -759,7 +364,7 @@ void ObxdAudioProcessor::getStateInformation(MemoryBlock& destData) void ObxdAudioProcessor::getCurrentProgramStateInformation(MemoryBlock& destData) { - XmlElement xmlState = XmlElement("Datsounds"); + XmlElement xmlState = XmlElement("discoDSP"); for (int k = 0; k < PARAM_COUNT; ++k) { @@ -910,7 +515,7 @@ bool ObxdAudioProcessor::loadFromFXBFile(const File& fxbFile) changeProgramName (getCurrentProgram(), prog->prgName); for (int i = 0; i < fxbSwap (prog->numParams); ++i) - setParameter (i, fxbSwapFloat (prog->params[i])); + setEngineParameterValue (i, fxbSwapFloat (prog->params[i])); } else if (compareMagic (set->fxMagic, "FBCh")) { @@ -954,7 +559,7 @@ bool ObxdAudioProcessor::restoreProgramSettings(const fxProgram* const prog) changeProgramName (getCurrentProgram(), prog->prgName); for (int i = 0; i < fxbSwap (prog->numParams); ++i) - setParameter (i, fxbSwapFloat (prog->params[i])); + setEngineParameterValue (i, fxbSwapFloat (prog->params[i])); return true; } @@ -988,7 +593,7 @@ File ObxdAudioProcessor::getCurrentBankFile() const File ObxdAudioProcessor::getDocumentFolder() const { File folder = File::getSpecialLocation(File::userDocumentsDirectory).getChildFile("discoDSP").getChildFile("OB-Xd"); - + if (! folder.exists()) { NativeMessageBox::showMessageBox(AlertWindow::WarningIcon, "Error", "Documents > discoDSP > OB-Xd folder not found."); @@ -1022,6 +627,378 @@ void ObxdAudioProcessor::setCurrentSkinFolder(const String& folderName) config->setNeedsToBeSaved(true); } +//============================================================================== +String ObxdAudioProcessor::getEngineParameterId (size_t index) +{ + switch (index) + { + case SELF_OSC_PUSH: return "SelfOscPush"; + case ENV_PITCH_BOTH: return "EnvPitchBoth"; + case FENV_INVERT: return "FenvInvert"; + case PW_OSC2_OFS: return "PwOfs"; + case LEVEL_DIF: return "LevelDif"; + case PW_ENV_BOTH: return "PwEnvBoth"; + case PW_ENV: return "PwEnv"; + case LFO_SYNC: return "LfoSync"; + case ECONOMY_MODE: return "EconomyMode"; + case UNLEARN: return "MidiUnlearn"; + case MIDILEARN: return "MidiLearn"; + case VAMPENV: return "VAmpFactor"; + case VFLTENV: return "VFltFactor"; + case ASPLAYEDALLOCATION: return "AsPlayedAllocation"; + case BENDLFORATE: return "VibratoRate"; + case FOURPOLE: return "FourPole"; + case LEGATOMODE: return "LegatoMode"; + case ENVPITCH: return "EnvelopeToPitch"; + case OSCQuantize: return "PitchQuant"; + case VOICE_COUNT: return "VoiceCount"; + case BANDPASS: return "BandpassBlend"; + case FILTER_WARM: return "Filter_Warm"; + case BENDRANGE: return "BendRange"; + case BENDOSC2: return "BendOsc2Only"; + case OCTAVE: return "Octave"; + case TUNE: return "Tune"; + case BRIGHTNESS: return "Brightness"; + case NOISEMIX: return "NoiseMix"; + case OSC1MIX: return "Osc1Mix"; + case OSC2MIX: return "Osc2Mix"; + case MULTIMODE: return "Multimode"; + case LFOSHWAVE: return "LfoSampleHoldWave"; + case LFOSINWAVE: return "LfoSineWave"; + case LFOSQUAREWAVE: return "LfoSquareWave"; + case LFO1AMT: return "LfoAmount1"; + case LFO2AMT: return "LfoAmount2"; + case LFOFILTER: return "LfoFilter"; + case LFOOSC1: return "LfoOsc1"; + case LFOOSC2: return "LfoOsc2"; + case LFOFREQ: return "LfoFrequency"; + case LFOPW1: return "LfoPw1"; + case LFOPW2: return "LfoPw2"; + case PORTADER: return "PortamentoDetune"; + case FILTERDER: return "FilterDetune"; + case ENVDER: return "EnvelopeDetune"; + case PAN1: return "Pan1"; + case PAN2: return "Pan2"; + case PAN3: return "Pan3"; + case PAN4: return "Pan4"; + case PAN5: return "Pan5"; + case PAN6: return "Pan6"; + case PAN7: return "Pan7"; + case PAN8: return "Pan8"; + case XMOD: return "Xmod"; + case OSC2HS: return "Osc2HardSync"; + case OSC1P: return "Osc1Pitch"; + case OSC2P: return "Osc2Pitch"; + case PORTAMENTO: return "Portamento"; + case UNISON: return "Unison"; + case FLT_KF: return "FilterKeyFollow"; + case PW: return "PulseWidth"; + case OSC2Saw: return "Osc2Saw"; + case OSC1Saw: return "Osc1Saw"; + case OSC1Pul: return "Osc1Pulse"; + case OSC2Pul: return "Osc2Pulse"; + case VOLUME: return "Volume"; + case UDET: return "VoiceDetune"; + case OSC2_DET: return "Oscillator2detune"; + case CUTOFF: return "Cutoff"; + case RESONANCE: return "Resonance"; + case ENVELOPE_AMT: return "FilterEnvAmount"; + case LATK: return "Attack"; + case LDEC: return "Decay"; + case LSUS: return "Sustain"; + case LREL: return "Release"; + case FATK: return "FilterAttack"; + case FDEC: return "FilterDecay"; + case FSUS: return "FilterSustain"; + case FREL: return "FilterRelease"; + + default: + break; + } + + return "Undefined"; +} + +int ObxdAudioProcessor::getParameterIndexFromId (String paramId) +{ + for (size_t i = 0; i < PARAM_COUNT; ++i) + { + if (paramId.compare (getEngineParameterId (i)) == 0) + { + return int (i); + } + } + + return -1; +} + +void ObxdAudioProcessor::setEngineParameterValue (int index, float newValue) +{ + if (! midiControlledParamSet || index == MIDILEARN || index == UNLEARN) + { + lastUsedParameter = index; + } + + programs.currentProgramPtr->values[index] = newValue; + + switch (index) + { + case SELF_OSC_PUSH: + synth.processSelfOscPush (newValue); + break; + case PW_ENV_BOTH: + synth.processPwEnvBoth (newValue); + break; + case PW_OSC2_OFS: + synth.processPwOfs (newValue); + break; + case ENV_PITCH_BOTH: + synth.processPitchModBoth (newValue); + break; + case FENV_INVERT: + synth.processInvertFenv (newValue); + break; + case LEVEL_DIF: + synth.processLoudnessDetune (newValue); + break; + case PW_ENV: + synth.processPwEnv (newValue); + break; + case LFO_SYNC: + synth.procLfoSync (newValue); + break; + case ECONOMY_MODE: + synth.procEconomyMode (newValue); + break; + case VAMPENV: + synth.procAmpVelocityAmount (newValue); + break; + case VFLTENV: + synth.procFltVelocityAmount (newValue); + break; + case ASPLAYEDALLOCATION: + synth.procAsPlayedAlloc (newValue); + break; + case BENDLFORATE: + synth.procModWheelFrequency (newValue); + break; + case FOURPOLE: + synth.processFourPole (newValue); + break; + case LEGATOMODE: + synth.processLegatoMode (newValue); + break; + case ENVPITCH: + synth.processEnvelopeToPitch (newValue); + break; + case OSCQuantize: + synth.processPitchQuantization (newValue); + break; + case VOICE_COUNT: + synth.setVoiceCount (newValue); + break; + case BANDPASS: + synth.processBandpassSw (newValue); + break; + case FILTER_WARM: + synth.processOversampling (newValue); + break; + case BENDOSC2: + synth.procPitchWheelOsc2Only (newValue); + break; + case BENDRANGE: + synth.procPitchWheelAmount (newValue); + break; + case NOISEMIX: + synth.processNoiseMix (newValue); + break; + case OCTAVE: + synth.processOctave (newValue); + break; + case TUNE: + synth.processTune (newValue); + break; + case BRIGHTNESS: + synth.processBrightness (newValue); + break; + case MULTIMODE: + synth.processMultimode (newValue); + break; + case LFOFREQ: + synth.processLfoFrequency (newValue); + break; + case LFO1AMT: + synth.processLfoAmt1 (newValue); + break; + case LFO2AMT: + synth.processLfoAmt2 (newValue); + break; + case LFOSINWAVE: + synth.processLfoSine (newValue); + break; + case LFOSQUAREWAVE: + synth.processLfoSquare (newValue); + break; + case LFOSHWAVE: + synth.processLfoSH (newValue); + break; + case LFOFILTER: + synth.processLfoFilter (newValue); + break; + case LFOOSC1: + synth.processLfoOsc1 (newValue); + break; + case LFOOSC2: + synth.processLfoOsc2 (newValue); + break; + case LFOPW1: + synth.processLfoPw1 (newValue); + break; + case LFOPW2: + synth.processLfoPw2 (newValue); + break; + case PORTADER: + synth.processPortamentoDetune (newValue); + break; + case FILTERDER: + synth.processFilterDetune (newValue); + break; + case ENVDER: + synth.processEnvelopeDetune (newValue); + break; + case XMOD: + synth.processOsc2Xmod (newValue); + break; + case OSC2HS: + synth.processOsc2HardSync (newValue); + break; + case OSC2P: + synth.processOsc2Pitch (newValue); + break; + case OSC1P: + synth.processOsc1Pitch (newValue); + break; + case PORTAMENTO: + synth.processPortamento (newValue); + break; + case UNISON: + synth.processUnison (newValue); + break; + case FLT_KF: + synth.processFilterKeyFollow (newValue); + break; + case OSC1MIX: + synth.processOsc1Mix (newValue); + break; + case OSC2MIX: + synth.processOsc2Mix (newValue); + break; + case PW: + synth.processPulseWidth (newValue); + break; + case OSC1Saw: + synth.processOsc1Saw (newValue); + break; + case OSC2Saw: + synth.processOsc2Saw (newValue); + break; + case OSC1Pul: + synth.processOsc1Pulse (newValue); + break; + case OSC2Pul: + synth.processOsc2Pulse (newValue); + break; + case VOLUME: + synth.processVolume (newValue); + break; + case UDET: + synth.processDetune (newValue); + break; + case OSC2_DET: + synth.processOsc2Det (newValue); + break; + case CUTOFF: + synth.processCutoff (newValue); + break; + case RESONANCE: + synth.processResonance (newValue); + break; + case ENVELOPE_AMT: + synth.processFilterEnvelopeAmt (newValue); + break; + case LATK: + synth.processLoudnessEnvelopeAttack (newValue); + break; + case LDEC: + synth.processLoudnessEnvelopeDecay (newValue); + break; + case LSUS: + synth.processLoudnessEnvelopeSustain (newValue); + break; + case LREL: + synth.processLoudnessEnvelopeRelease (newValue); + break; + case FATK: + synth.processFilterEnvelopeAttack (newValue); + break; + case FDEC: + synth.processFilterEnvelopeDecay (newValue); + break; + case FSUS: + synth.processFilterEnvelopeSustain (newValue); + break; + case FREL: + synth.processFilterEnvelopeRelease (newValue); + break; + case PAN1: + synth.processPan (newValue,1); + break; + case PAN2: + synth.processPan (newValue,2); + break; + case PAN3: + synth.processPan (newValue,3); + break; + case PAN4: + synth.processPan (newValue,4); + break; + case PAN5: + synth.processPan (newValue,5); + break; + case PAN6: + synth.processPan (newValue,6); + break; + case PAN7: + synth.processPan (newValue,7); + break; + case PAN8: + synth.processPan (newValue,8); + break; + } + + //DIRTY HACK + //This should be checked to avoid stalling on gui update + //It is needed because some hosts do wierd stuff + if (isHostAutomatedChange) + sendChangeMessage(); +} + +//============================================================================== +void ObxdAudioProcessor::parameterChanged (const String& parameter, float newValue) +{ + int index = getParameterIndexFromId (parameter); + + if ( isPositiveAndBelow (index, PARAM_COUNT) ) + { + setEngineParameterValue (index, newValue); + } +} + +AudioProcessorValueTreeState& ObxdAudioProcessor::getPluginState() +{ + return apvtState; +} + //============================================================================== // This creates new instances of the plugin.. AudioProcessor* JUCE_CALLTYPE createPluginFilter() diff --git a/Source/PluginProcessor.h b/Source/PluginProcessor.h index 89f2ae9..67a3a13 100755 --- a/Source/PluginProcessor.h +++ b/Source/PluginProcessor.h @@ -113,10 +113,9 @@ static inline float fxbSwapFloat (const float x) noexcept //============================================================================== /** */ -class ObxdAudioProcessor : - public AudioProcessor, - // public AudioProcessorListener, - public ChangeBroadcaster +class ObxdAudioProcessor : public AudioProcessor, + public AudioProcessorValueTreeState::Listener, + public ChangeBroadcaster { public: //============================================================================== @@ -124,53 +123,44 @@ public: ~ObxdAudioProcessor(); //============================================================================== - void prepareToPlay (double sampleRate, int samplesPerBlock); - void releaseResources(); + void prepareToPlay (double sampleRate, int samplesPerBlock) override; + void releaseResources() override; - void processBlock (AudioSampleBuffer& buffer, MidiBuffer& midiMessages); + void processBlock (AudioSampleBuffer& buffer, MidiBuffer& midiMessages) override; //============================================================================== - AudioProcessorEditor* createEditor(); - bool hasEditor() const; + AudioProcessorEditor* createEditor() override; + bool hasEditor() const override; //============================================================================== - void processMidiPerSample(MidiBuffer::Iterator* iter,const int samplePos); - bool getNextEvent(MidiBuffer::Iterator* iter,const int samplePos); + void processMidiPerSample (MidiBuffer::Iterator* iter, const int samplePos); + bool getNextEvent (MidiBuffer::Iterator* iter, const int samplePos); //============================================================================== - void initAllParams(); + void initAllParams(); + + const String getInputChannelName (int channelIndex) const override; // WATCH OUT! + const String getOutputChannelName (int channelIndex) const override; // WATCH OUT! + bool isInputChannelStereoPair (int index) const override; // WATCH OUT! + bool isOutputChannelStereoPair (int index) const override; // WATCH OUT! - int getNumParameters(); - - float getParameter (int index); - void setParameter (int index, float newValue); - - const String getParameterName (int index); - const String getParameterText (int index); - - const String getInputChannelName (int channelIndex) const; - const String getOutputChannelName (int channelIndex) const; - bool isInputChannelStereoPair (int index) const; - bool isOutputChannelStereoPair (int index) const; - - bool acceptsMidi() const; - bool producesMidi() const; - bool silenceInProducesSilenceOut() const; - double getTailLengthSeconds() const; - const String getName() const; + bool acceptsMidi() const override; + bool producesMidi() const override; + double getTailLengthSeconds() const override; + const String getName() const override; //============================================================================== - int getNumPrograms(); - int getCurrentProgram(); - void setCurrentProgram (int index); - const String getProgramName (int index); - void changeProgramName (int index, const String& newName); + int getNumPrograms() override; + int getCurrentProgram() override; + void setCurrentProgram (int index) override; + const String getProgramName (int index) override; + void changeProgramName (int index, const String& newName) override; //============================================================================== - void getStateInformation (MemoryBlock& destData); - void setStateInformation (const void* data, int sizeInBytes); - void setCurrentProgramStateInformation(const void* data,int sizeInBytes); - void getCurrentProgramStateInformation(MemoryBlock& destData); + void getStateInformation (MemoryBlock& destData) override; + void setStateInformation (const void* data, int sizeInBytes) override; + void setCurrentProgramStateInformation (const void* data,int sizeInBytes) override; + void getCurrentProgramStateInformation (MemoryBlock& destData) override; //============================================================================== void scanAndUpdateBanks(); @@ -189,6 +179,13 @@ public: File getCurrentSkinFolder() const; void setCurrentSkinFolder(const String& folderName); + + //============================================================================== + static String getEngineParameterId (size_t); + int getParameterIndexFromId (String); + void setEngineParameterValue (int, float); + void parameterChanged (const String&, float) override; + AudioProcessorValueTreeState& getPluginState(); private: //============================================================================== @@ -212,8 +209,12 @@ private: String currentBank; Array bankFiles; - ScopedPointer config; + std::unique_ptr config; InterProcessLock configLock; + + //============================================================================== + AudioProcessorValueTreeState apvtState; + UndoManager undoManager; //============================================================================== JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ObxdAudioProcessor)