Scalable GUI
This commit is contained in:
George Reales
parent
b12f449397
commit
791ecc73e2
37
OB-Xd.jucer
37
OB-Xd.jucer
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<JUCERPROJECT id="mxW328" name="OB-Xd" projectType="audioplug" version="2.4.0"
|
<JUCERPROJECT id="mxW328" name="OB-Xd" projectType="audioplug" version="2.5.0"
|
||||||
bundleIdentifier="com.discoDSP.Obxd" includeBinaryInAppConfig="1"
|
bundleIdentifier="com.discoDSP.Obxd" includeBinaryInAppConfig="1"
|
||||||
pluginName="OB-Xd" pluginDesc="Emulation of famous OB-X, OB-Xa and OB-8 synths"
|
pluginName="OB-Xd" pluginDesc="Emulation of famous OB-X, OB-Xa and OB-8 synths"
|
||||||
pluginManufacturer="discoDSP" pluginManufacturerCode="DDSP" pluginCode="Obxd"
|
pluginManufacturer="discoDSP" pluginManufacturerCode="DDSP" pluginCode="Obxd"
|
||||||
|
|
@ -11,12 +11,16 @@
|
||||||
pluginIsMidiEffectPlugin="0" pluginCharacteristicsValue="pluginIsSynth,pluginWantsMidiIn"
|
pluginIsMidiEffectPlugin="0" pluginCharacteristicsValue="pluginIsSynth,pluginWantsMidiIn"
|
||||||
pluginFormats="buildAU,buildStandalone,buildVST3" buildVST="0"
|
pluginFormats="buildAU,buildStandalone,buildVST3" buildVST="0"
|
||||||
buildVST3="1" buildAU="1" buildAUv3="0" buildRTAS="0" buildAAX="0"
|
buildVST3="1" buildAU="1" buildAUv3="0" buildRTAS="0" buildAAX="0"
|
||||||
buildStandalone="1" enableIAA="0" displaySplashScreen="0" jucerFormatVersion="1"
|
buildStandalone="1" enableIAA="0" displaySplashScreen="1" jucerFormatVersion="1"
|
||||||
pluginChannelConfigs="{0,2}" companyCopyright="discoDSP" companyEmail="contactus@discodsp.com"
|
pluginChannelConfigs="{0,2}" companyCopyright="discoDSP" companyEmail="contactus@discodsp.com"
|
||||||
pluginAAXCategory="2048" pluginVSTCategory="kPlugCategSynth">
|
pluginAAXCategory="2048" pluginVSTCategory="kPlugCategSynth">
|
||||||
<MAINGROUP id="NZ3n4V" name="OB-Xd">
|
<MAINGROUP id="NZ3n4V" name="OB-Xd">
|
||||||
<GROUP id="{90740217-84AB-FD0D-FBC4-CA9EA2C68D5E}" name="Source">
|
<GROUP id="{90740217-84AB-FD0D-FBC4-CA9EA2C68D5E}" name="Source">
|
||||||
<GROUP id="{BD020CFA-798B-F1A1-A6C7-7559BD467248}" name="Components">
|
<GROUP id="{BD020CFA-798B-F1A1-A6C7-7559BD467248}" name="Components">
|
||||||
|
<FILE id="ZHNz4D" name="ScaleComponent.cpp" compile="1" resource="0"
|
||||||
|
file="Source/Components/ScaleComponent.cpp"/>
|
||||||
|
<FILE id="j4plOT" name="ScaleComponent.h" compile="0" resource="0"
|
||||||
|
file="Source/Components/ScaleComponent.h"/>
|
||||||
<FILE id="XnxhrR" name="PresetBar.h" compile="0" resource="0" file="Source/Components/PresetBar.h"/>
|
<FILE id="XnxhrR" name="PresetBar.h" compile="0" resource="0" file="Source/Components/PresetBar.h"/>
|
||||||
<FILE id="GHGyel" name="PresetBar.cpp" compile="1" resource="0" file="Source/Components/PresetBar.cpp"/>
|
<FILE id="GHGyel" name="PresetBar.cpp" compile="1" resource="0" file="Source/Components/PresetBar.cpp"/>
|
||||||
<FILE id="qhLBZY" name="SetPresetNameWindow.cpp" compile="1" resource="0"
|
<FILE id="qhLBZY" name="SetPresetNameWindow.cpp" compile="1" resource="0"
|
||||||
|
|
@ -33,6 +37,7 @@
|
||||||
</GROUP>
|
</GROUP>
|
||||||
<GROUP id="{6995BDF2-263F-3CA7-8CA4-4E21F325477A}" name="Gui">
|
<GROUP id="{6995BDF2-263F-3CA7-8CA4-4E21F325477A}" name="Gui">
|
||||||
<FILE id="zJoidp" name="ButtonList.h" compile="0" resource="0" file="Source/Gui/ButtonList.h"/>
|
<FILE id="zJoidp" name="ButtonList.h" compile="0" resource="0" file="Source/Gui/ButtonList.h"/>
|
||||||
|
<FILE id="I5Qd7K" name="ImageButton.h" compile="0" resource="0" file="Source/Gui/ImageButton.h"/>
|
||||||
<FILE id="lB2ss0" name="Knob.h" compile="0" resource="0" file="Source/Gui/Knob.h"/>
|
<FILE id="lB2ss0" name="Knob.h" compile="0" resource="0" file="Source/Gui/Knob.h"/>
|
||||||
<FILE id="YKpBza" name="TooglableButton.h" compile="0" resource="0"
|
<FILE id="YKpBza" name="TooglableButton.h" compile="0" resource="0"
|
||||||
file="Source/Gui/TooglableButton.h"/>
|
file="Source/Gui/TooglableButton.h"/>
|
||||||
|
|
@ -80,7 +85,7 @@
|
||||||
stripLocalSymbols="0" linkTimeOptimisation="0"/>
|
stripLocalSymbols="0" linkTimeOptimisation="0"/>
|
||||||
<CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="OB-Xd"
|
<CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="OB-Xd"
|
||||||
stripLocalSymbols="1" linkTimeOptimisation="1" osxCompatibility="10.9 SDK"
|
stripLocalSymbols="1" linkTimeOptimisation="1" osxCompatibility="10.9 SDK"
|
||||||
enablePluginBinaryCopyStep="1"/>
|
enablePluginBinaryCopyStep="1" macOSDeploymentTarget="10.9"/>
|
||||||
</CONFIGURATIONS>
|
</CONFIGURATIONS>
|
||||||
<MODULEPATHS>
|
<MODULEPATHS>
|
||||||
<MODULEPATH id="juce_opengl" path="Modules"/>
|
<MODULEPATH id="juce_opengl" path="Modules"/>
|
||||||
|
|
@ -149,20 +154,20 @@
|
||||||
</VS2019>
|
</VS2019>
|
||||||
</EXPORTFORMATS>
|
</EXPORTFORMATS>
|
||||||
<MODULES>
|
<MODULES>
|
||||||
<MODULES id="juce_audio_basics" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
|
<MODULES id="juce_audio_basics" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
|
||||||
<MODULES id="juce_audio_devices" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
|
<MODULES id="juce_audio_devices" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
|
||||||
<MODULES id="juce_audio_formats" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
|
<MODULES id="juce_audio_formats" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
|
||||||
<MODULES id="juce_audio_plugin_client" showAllCode="1" useLocalCopy="0"
|
<MODULES id="juce_audio_plugin_client" showAllCode="1" useLocalCopy="0"
|
||||||
useGlobalPath="0"/>
|
useGlobalPath="1"/>
|
||||||
<MODULES id="juce_audio_processors" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
|
<MODULES id="juce_audio_processors" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
|
||||||
<MODULE id="juce_audio_utils" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
|
<MODULE id="juce_audio_utils" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
|
||||||
<MODULES id="juce_core" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
|
<MODULES id="juce_core" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
|
||||||
<MODULES id="juce_data_structures" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
|
<MODULES id="juce_data_structures" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
|
||||||
<MODULES id="juce_events" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
|
<MODULES id="juce_events" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
|
||||||
<MODULES id="juce_graphics" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
|
<MODULES id="juce_graphics" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
|
||||||
<MODULES id="juce_gui_basics" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
|
<MODULES id="juce_gui_basics" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
|
||||||
<MODULES id="juce_gui_extra" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
|
<MODULES id="juce_gui_extra" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
|
||||||
<MODULES id="juce_opengl" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
|
<MODULES id="juce_opengl" showAllCode="1" useLocalCopy="0" useGlobalPath="1"/>
|
||||||
</MODULES>
|
</MODULES>
|
||||||
<JUCEOPTIONS JUCE_QUICKTIME="disabled" JUCE_WEB_BROWSER="0" JUCE_ASIO="1"
|
<JUCEOPTIONS JUCE_QUICKTIME="disabled" JUCE_WEB_BROWSER="0" JUCE_ASIO="1"
|
||||||
JUCE_JACK="1" JUCE_USE_CURL="0"/>
|
JUCE_JACK="1" JUCE_USE_CURL="0"/>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,136 @@
|
||||||
|
/*
|
||||||
|
==============================================================================
|
||||||
|
|
||||||
|
ScaleComponent.cpp
|
||||||
|
Created: 27 Aug 2021 1:26:08pm
|
||||||
|
Author: discoDSP
|
||||||
|
|
||||||
|
==============================================================================
|
||||||
|
*/
|
||||||
|
#include "../PluginProcessor.h"
|
||||||
|
#include "ScaleComponent.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//==============================================================================
|
||||||
|
ScalableComponent::ScalableComponent(ObxdAudioProcessor* owner_)
|
||||||
|
: scaleFactor(0.0f),
|
||||||
|
isHighResolutionDisplay(false),
|
||||||
|
processor(owner_)
|
||||||
|
{
|
||||||
|
setScaleFactor(1.0f, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
ScalableComponent::~ScalableComponent()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void ScalableComponent::setScaleFactor(float newScaleFactor, bool newIsHighResolutionDisplay)
|
||||||
|
{
|
||||||
|
// until we get a freely scalable editor !!!
|
||||||
|
jassert(newScaleFactor == 1.0f || newScaleFactor == 1.5f || newScaleFactor == 2.0f);
|
||||||
|
|
||||||
|
if (scaleFactor != newScaleFactor || isHighResolutionDisplay != newIsHighResolutionDisplay)
|
||||||
|
{
|
||||||
|
scaleFactor = newScaleFactor;
|
||||||
|
isHighResolutionDisplay = newIsHighResolutionDisplay;
|
||||||
|
|
||||||
|
scaleFactorChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
float ScalableComponent::getScaleImage(){
|
||||||
|
float scale = 1.0;
|
||||||
|
if (!isHighResolutionDisplay)
|
||||||
|
{
|
||||||
|
if (getScaleFactor() == 1.5f)
|
||||||
|
{
|
||||||
|
scale= 0.75f;
|
||||||
|
}
|
||||||
|
else if (getScaleFactor() == 2.0f)
|
||||||
|
{
|
||||||
|
scale= 0.5f;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (getScaleFactor() == 1.0f) //2x image
|
||||||
|
{
|
||||||
|
scale= 0.5f;
|
||||||
|
}
|
||||||
|
else if (getScaleFactor() == 1.5f) //4x images =>150%
|
||||||
|
{
|
||||||
|
scale= (0.25f + 0.125f);
|
||||||
|
}
|
||||||
|
else if (getScaleFactor() == 2.0f) //4x images =>200x
|
||||||
|
{
|
||||||
|
scale= 0.5f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return scale;
|
||||||
|
};
|
||||||
|
|
||||||
|
float ScalableComponent::getScaleFactor() const
|
||||||
|
{
|
||||||
|
return scaleFactor;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ScalableComponent::getIsHighResolutionDisplay() const
|
||||||
|
{
|
||||||
|
return isHighResolutionDisplay;
|
||||||
|
}
|
||||||
|
|
||||||
|
int ScalableComponent::getScaleInt(){
|
||||||
|
int scaleFactorInt = 1;
|
||||||
|
if (scaleFactor == 1.5f)
|
||||||
|
scaleFactorInt = 2;
|
||||||
|
if (scaleFactor == 2.0f)
|
||||||
|
scaleFactorInt = 4;
|
||||||
|
|
||||||
|
if (isHighResolutionDisplay){
|
||||||
|
scaleFactorInt *= 2;
|
||||||
|
}
|
||||||
|
if (scaleFactorInt> 4){
|
||||||
|
scaleFactorInt=4;
|
||||||
|
}
|
||||||
|
return scaleFactorInt;
|
||||||
|
}
|
||||||
|
|
||||||
|
Image ScalableComponent::getScaledImageFromCache(const String& imageName,
|
||||||
|
float scaleFactor,
|
||||||
|
bool isHighResolutionDisplay)
|
||||||
|
{
|
||||||
|
jassert(scaleFactor == 1.0f || scaleFactor == 1.5f || scaleFactor == 2.0f);
|
||||||
|
this->isHighResolutionDisplay = isHighResolutionDisplay;
|
||||||
|
int scaleFactorInt = getScaleInt();
|
||||||
|
const String resourceName = imageName
|
||||||
|
+ String::formatted("_png", scaleFactorInt);
|
||||||
|
|
||||||
|
int size = 0;
|
||||||
|
File skin;
|
||||||
|
if (processor){
|
||||||
|
File f(processor->getCurrentSkinFolder());
|
||||||
|
if (f.isDirectory()){
|
||||||
|
skin=f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const char* data = nullptr;
|
||||||
|
String image_file = imageName;
|
||||||
|
if (scaleFactorInt ==1)
|
||||||
|
image_file += ".png";
|
||||||
|
else
|
||||||
|
image_file += String::formatted("@%dx.png", scaleFactorInt);
|
||||||
|
DBG(" Loaf image: " << image_file);
|
||||||
|
File file = skin.getChildFile(image_file);
|
||||||
|
if (file.exists()){
|
||||||
|
return ImageCache::getFromFile(file);
|
||||||
|
} else {
|
||||||
|
data = BinaryData::getNamedResource((const char*)resourceName.toUTF8(), size);
|
||||||
|
return ImageCache::getFromMemory(data, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void ScalableComponent::scaleFactorChanged()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,41 @@
|
||||||
|
/*
|
||||||
|
==============================================================================
|
||||||
|
|
||||||
|
ScaleComponent.h
|
||||||
|
Created: 27 Aug 2021 1:26:08pm
|
||||||
|
Author: discoDSP
|
||||||
|
|
||||||
|
==============================================================================
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
//==============================================================================
|
||||||
|
#include <JuceHeader.h>
|
||||||
|
class ObxdAudioProcessor;
|
||||||
|
|
||||||
|
|
||||||
|
//==============================================================================
|
||||||
|
class ScalableComponent
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
~ScalableComponent();
|
||||||
|
int getScaleInt();
|
||||||
|
void setScaleFactor(float newScaleFactor, bool newIsHighResolutionDisplay);
|
||||||
|
float getScaleImage();
|
||||||
|
float getScaleFactor() const;
|
||||||
|
bool getIsHighResolutionDisplay() const;
|
||||||
|
|
||||||
|
virtual void scaleFactorChanged();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
ScalableComponent(ObxdAudioProcessor* owner_);
|
||||||
|
|
||||||
|
Image getScaledImageFromCache(const String& imageName, float scaleFactor, bool isHighResolutionDisplay);
|
||||||
|
|
||||||
|
private:
|
||||||
|
ObxdAudioProcessor* processor;
|
||||||
|
float scaleFactor;
|
||||||
|
bool isHighResolutionDisplay;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
@ -23,19 +23,32 @@
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "../Source/Engine/SynthEngine.h"
|
#include "../Source/Engine/SynthEngine.h"
|
||||||
|
class ObxdAudioProcessor;
|
||||||
|
|
||||||
class ButtonList : public ComboBox
|
class ButtonList : public ComboBox, public ScalableComponent
|
||||||
{
|
{
|
||||||
|
juce::String img_name;
|
||||||
public:
|
public:
|
||||||
ButtonList (Image k, int fh) : ComboBox("cb")
|
ButtonList (juce::String nameImg, int fh, ObxdAudioProcessor *owner) : ComboBox("cb"), ScalableComponent(owner), img_name(nameImg)
|
||||||
{
|
{
|
||||||
kni = k;
|
scaleFactorChanged();
|
||||||
count = 0;
|
count = 0;
|
||||||
h2 = fh;
|
h2 = fh;
|
||||||
w2 = k.getWidth();
|
w2 = kni.getWidth();
|
||||||
}
|
}
|
||||||
//int addItem
|
//int addItem
|
||||||
|
void scaleFactorChanged() override
|
||||||
|
{
|
||||||
|
kni = getScaledImageFromCache(img_name, getScaleFactor(), getIsHighResolutionDisplay());
|
||||||
|
/*
|
||||||
|
backgroundImage =
|
||||||
|
allImage.getClippedImage(Rectangle<int>(0,
|
||||||
|
allImage.getHeight() / 2,
|
||||||
|
allImage.getWidth(),
|
||||||
|
allImage.getHeight() / 2));
|
||||||
|
*/
|
||||||
|
repaint();
|
||||||
|
}
|
||||||
// Source: https://git.iem.at/audioplugins/IEMPluginSuite/-/blob/master/resources/customComponents/ReverseSlider.h
|
// Source: https://git.iem.at/audioplugins/IEMPluginSuite/-/blob/master/resources/customComponents/ReverseSlider.h
|
||||||
public:
|
public:
|
||||||
class ButtonListAttachment : public juce::AudioProcessorValueTreeState::ComboBoxAttachment
|
class ButtonListAttachment : public juce::AudioProcessorValueTreeState::ComboBoxAttachment
|
||||||
|
|
@ -94,7 +107,7 @@ public:
|
||||||
void paintOverChildren (Graphics& g) override
|
void paintOverChildren (Graphics& g) override
|
||||||
{
|
{
|
||||||
int ofs = getSelectedId() - 1;
|
int ofs = getSelectedId() - 1;
|
||||||
g.drawImage(kni, 0, 0, getWidth(), getHeight(), 0, h2 * ofs, w2, h2);
|
g.drawImage(kni, 0, 0, getWidth(), getHeight(), 0, h2 * ofs * getScaleInt(), w2 * getScaleInt() , h2* getScaleInt());
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,87 @@
|
||||||
|
/*
|
||||||
|
==============================================================================
|
||||||
|
This file is part of Obxd synthesizer.
|
||||||
|
|
||||||
|
Copyright <EFBFBD> 2013-2014 Filatov Vadim
|
||||||
|
|
||||||
|
Contact author via email :
|
||||||
|
justdat_@_e1.ru
|
||||||
|
|
||||||
|
This file may be licensed under the terms of of the
|
||||||
|
GNU General Public License Version 2 (the ``GPL'').
|
||||||
|
|
||||||
|
Software distributed under the License is distributed
|
||||||
|
on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
|
||||||
|
express or implied. See the GPL for the specific language
|
||||||
|
governing rights and limitations.
|
||||||
|
|
||||||
|
You should have received a copy of the GPL along with this
|
||||||
|
program. If not, go to http://www.gnu.org/licenses/gpl.html
|
||||||
|
or write to the Free Software Foundation, Inc.,
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
==============================================================================
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
#include "../Source/Engine/SynthEngine.h"
|
||||||
|
class ObxdAudioProcessor;
|
||||||
|
|
||||||
|
|
||||||
|
class ImageMenu : public ImageButton,
|
||||||
|
public ScalableComponent
|
||||||
|
{
|
||||||
|
juce::String img_name;
|
||||||
|
public:
|
||||||
|
ImageMenu(juce::String nameImg, ObxdAudioProcessor* owner_)
|
||||||
|
: ScalableComponent(owner_), img_name(nameImg)
|
||||||
|
{
|
||||||
|
scaleFactorChanged();
|
||||||
|
|
||||||
|
setOpaque(false);
|
||||||
|
setVisible(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void scaleFactorChanged() override
|
||||||
|
{
|
||||||
|
const float scaleFactor = getScaleFactor();
|
||||||
|
const bool isHighResolutionDisplay = getIsHighResolutionDisplay();
|
||||||
|
|
||||||
|
Image normalImage = getScaledImageFromCache(img_name, scaleFactor, isHighResolutionDisplay);
|
||||||
|
Image downImage = getScaledImageFromCache(img_name, scaleFactor, isHighResolutionDisplay);
|
||||||
|
|
||||||
|
const bool resizeButtonNowToFitThisImage = false;
|
||||||
|
const bool rescaleImagesWhenButtonSizeChanges = true;
|
||||||
|
const bool preserveImageProportions = true;
|
||||||
|
/*
|
||||||
|
false,
|
||||||
|
true,
|
||||||
|
true,
|
||||||
|
image,
|
||||||
|
1.0f, // menu transparency
|
||||||
|
Colour(),
|
||||||
|
image,
|
||||||
|
1.0f, // menu hover transparency
|
||||||
|
Colour(),
|
||||||
|
image,
|
||||||
|
0.3f, // menu click transparency
|
||||||
|
Colour());
|
||||||
|
*/
|
||||||
|
setImages(resizeButtonNowToFitThisImage,
|
||||||
|
rescaleImagesWhenButtonSizeChanges,
|
||||||
|
preserveImageProportions,
|
||||||
|
normalImage,
|
||||||
|
1.0f, // menu transparency
|
||||||
|
Colour(),
|
||||||
|
normalImage,
|
||||||
|
1.0f, // menu hover transparency
|
||||||
|
Colour(),
|
||||||
|
downImage,
|
||||||
|
0.3f, // menu click transparency
|
||||||
|
Colour());
|
||||||
|
|
||||||
|
repaint();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
protected:
|
||||||
|
};
|
||||||
|
|
@ -23,9 +23,11 @@
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "../Source/Engine/SynthEngine.h"
|
#include "../Source/Engine/SynthEngine.h"
|
||||||
|
#include "../Components/ScaleComponent.h"
|
||||||
class Knob : public Slider
|
class ObxdAudioProcessor;
|
||||||
|
class Knob : public Slider, public ScalableComponent
|
||||||
{
|
{
|
||||||
|
juce::String img_name;
|
||||||
public:
|
public:
|
||||||
//Knob(Image image, const int numFrames, const bool stripIsHorizontal) : Slider("Knob")
|
//Knob(Image image, const int numFrames, const bool stripIsHorizontal) : Slider("Knob")
|
||||||
//{
|
//{
|
||||||
|
|
@ -34,14 +36,27 @@ public:
|
||||||
// setSliderStyle(RotaryVerticalDrag);
|
// setSliderStyle(RotaryVerticalDrag);
|
||||||
// setRange(0.0f, 1.0f, 0.001f);
|
// setRange(0.0f, 1.0f, 0.001f);
|
||||||
//}
|
//}
|
||||||
Knob (Image k, int fh) : Slider("Knob")
|
Knob (juce::String name, int fh, ObxdAudioProcessor* owner_) : Slider("Knob"), ScalableComponent(owner_), img_name(name)
|
||||||
{
|
{
|
||||||
|
scaleFactorChanged();
|
||||||
|
|
||||||
h2 = fh;
|
h2 = fh;
|
||||||
w2 = k.getWidth();
|
w2 = kni.getWidth();
|
||||||
numFr = k.getHeight() / h2;
|
numFr = kni.getHeight() / h2;
|
||||||
kni = k;
|
|
||||||
};
|
};
|
||||||
|
void scaleFactorChanged() override
|
||||||
|
{
|
||||||
|
kni = getScaledImageFromCache(img_name, getScaleFactor(), getIsHighResolutionDisplay());
|
||||||
|
/*
|
||||||
|
backgroundImage =
|
||||||
|
allImage.getClippedImage(Rectangle<int>(0,
|
||||||
|
allImage.getHeight() / 2,
|
||||||
|
allImage.getWidth(),
|
||||||
|
allImage.getHeight() / 2));
|
||||||
|
*/
|
||||||
|
repaint();
|
||||||
|
}
|
||||||
// Source: https://git.iem.at/audioplugins/IEMPluginSuite/-/blob/master/resources/customComponents/ReverseSlider.h
|
// Source: https://git.iem.at/audioplugins/IEMPluginSuite/-/blob/master/resources/customComponents/ReverseSlider.h
|
||||||
public:
|
public:
|
||||||
class KnobAttachment : public juce::AudioProcessorValueTreeState::SliderAttachment
|
class KnobAttachment : public juce::AudioProcessorValueTreeState::SliderAttachment
|
||||||
|
|
@ -68,7 +83,7 @@ public:
|
||||||
float val = parameter->getValue();
|
float val = parameter->getValue();
|
||||||
//sliderToControl->setValue(parameter->convertFrom0to1(val0to1));
|
//sliderToControl->setValue(parameter->convertFrom0to1(val0to1));
|
||||||
sliderToControl->setValue(val, NotificationType::dontSendNotification);
|
sliderToControl->setValue(val, NotificationType::dontSendNotification);
|
||||||
DBG(" Slider: " << parameter->name << " " << sliderToControl->getValue() << " Parameter: "<< " " << parameter->getValue());
|
//DBG(" Slider: " << parameter->name << " " << sliderToControl->getValue() << " Parameter: "<< " " << parameter->getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual ~KnobAttachment() = default;
|
virtual ~KnobAttachment() = default;
|
||||||
|
|
@ -87,7 +102,7 @@ public:
|
||||||
void paint (Graphics& g) override
|
void paint (Graphics& g) override
|
||||||
{
|
{
|
||||||
int ofs = (int) ((getValue() - getMinimum()) / (getMaximum() - getMinimum()) * (numFr - 1));
|
int ofs = (int) ((getValue() - getMinimum()) / (getMaximum() - getMinimum()) * (numFr - 1));
|
||||||
g.drawImage (kni, 0, 0, getWidth(), getHeight(), 0, h2 * ofs, w2, h2);
|
g.drawImage (kni, 0, 0, getWidth(), getHeight(), 0, h2 * ofs * getScaleInt(), w2 * getScaleInt(), h2 * getScaleInt());
|
||||||
}
|
}
|
||||||
|
|
||||||
~Knob() override {};
|
~Knob() override {};
|
||||||
|
|
|
||||||
|
|
@ -23,14 +23,18 @@
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "../Source/Engine/SynthEngine.h"
|
#include "../Source/Engine/SynthEngine.h"
|
||||||
|
#include "../Components/ScaleComponent.h"
|
||||||
|
class ObxdAudioProcessor;
|
||||||
|
|
||||||
class TooglableButton : public ImageButton
|
class TooglableButton : public ImageButton, public ScalableComponent
|
||||||
{
|
{
|
||||||
|
juce::String img_name;
|
||||||
public:
|
public:
|
||||||
TooglableButton (Image k) : ImageButton()
|
TooglableButton (juce::String name, ObxdAudioProcessor *owner) : ImageButton(),ScalableComponent(owner), img_name(name)
|
||||||
{
|
{
|
||||||
//this->setImages
|
//this->setImages
|
||||||
kni = k;
|
//kni = k;
|
||||||
|
scaleFactorChanged();
|
||||||
//toogled = false;
|
//toogled = false;
|
||||||
width = kni.getWidth();
|
width = kni.getWidth();
|
||||||
height = kni.getHeight();
|
height = kni.getHeight();
|
||||||
|
|
@ -38,6 +42,18 @@ public:
|
||||||
h2 = height / 2;
|
h2 = height / 2;
|
||||||
this->setClickingTogglesState (true);
|
this->setClickingTogglesState (true);
|
||||||
}
|
}
|
||||||
|
void scaleFactorChanged() override
|
||||||
|
{
|
||||||
|
kni = getScaledImageFromCache(img_name, getScaleFactor(), getIsHighResolutionDisplay());
|
||||||
|
/*
|
||||||
|
backgroundImage =
|
||||||
|
allImage.getClippedImage(Rectangle<int>(0,
|
||||||
|
allImage.getHeight() / 2,
|
||||||
|
allImage.getWidth(),
|
||||||
|
allImage.getHeight() / 2));
|
||||||
|
*/
|
||||||
|
repaint();
|
||||||
|
}
|
||||||
~TooglableButton() override{
|
~TooglableButton() override{
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
@ -102,7 +118,7 @@ public:
|
||||||
offset = 1;
|
offset = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
g.drawImage(kni, 0, 0, getWidth(), getHeight(), 0, offset * h2, w2, h2);
|
g.drawImage(kni, 0, 0, getWidth(), getHeight(), 0, offset * h2 * getScaleInt() , w2 * getScaleInt(), h2 * getScaleInt());
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
void setValue (float state, int notify)
|
void setValue (float state, int notify)
|
||||||
|
|
|
||||||
|
|
@ -10,11 +10,12 @@ It contains the basic startup code for a Juce application.
|
||||||
#include "PluginProcessor.h"
|
#include "PluginProcessor.h"
|
||||||
#include "PluginEditor.h"
|
#include "PluginEditor.h"
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
#include "Gui/ImageButton.h"
|
||||||
// #include "GUI/BinaryData.h"
|
// #include "GUI/BinaryData.h"
|
||||||
|
|
||||||
//==============================================================================
|
//==============================================================================
|
||||||
ObxdAudioProcessorEditor::ObxdAudioProcessorEditor (ObxdAudioProcessor& ownerFilter)
|
ObxdAudioProcessorEditor::ObxdAudioProcessorEditor (ObxdAudioProcessor& ownerFilter)
|
||||||
: AudioProcessorEditor (&ownerFilter), processor (ownerFilter),
|
: AudioProcessorEditor (&ownerFilter), ScalableComponent(&ownerFilter), processor (ownerFilter),
|
||||||
skinFolder (processor.getSkinFolder()),
|
skinFolder (processor.getSkinFolder()),
|
||||||
progStart (3000),
|
progStart (3000),
|
||||||
bankStart (2000),
|
bankStart (2000),
|
||||||
|
|
@ -52,10 +53,25 @@ ObxdAudioProcessorEditor::ObxdAudioProcessorEditor (ObxdAudioProcessor& ownerFil
|
||||||
DBG("W: " <<getWidth() << " H:" << getHeight());
|
DBG("W: " <<getWidth() << " H:" << getHeight());
|
||||||
|
|
||||||
loadSkin (processor);
|
loadSkin (processor);
|
||||||
|
|
||||||
repaint();
|
|
||||||
|
|
||||||
updateFromHost();
|
updateFromHost();
|
||||||
|
|
||||||
|
switch(processor.gui_size)
|
||||||
|
{
|
||||||
|
case 1:
|
||||||
|
ScalableComponent::setScaleFactor(1.0f, isHighResolutionDisplay());
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
ScalableComponent::setScaleFactor(1.5f, isHighResolutionDisplay());
|
||||||
|
break;
|
||||||
|
case 4:
|
||||||
|
ScalableComponent::setScaleFactor(2.0f, isHighResolutionDisplay());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
//scaleFactorChanged();
|
||||||
|
//repaint();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -77,6 +93,51 @@ void ObxdAudioProcessorEditor::resized() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
skinFolder = processor.getCurrentSkinFolder();
|
||||||
|
File coords = skinFolder.getChildFile ("coords.xml");
|
||||||
|
if (!coords.existsAsFile()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
XmlDocument skin (coords);
|
||||||
|
auto doc = skin.getDocumentElement();
|
||||||
|
if (doc){
|
||||||
|
//int xScreen = getWidth(), yScreen = getHeight();
|
||||||
|
if (doc->getTagName() == "PROPERTIES"){
|
||||||
|
forEachXmlChildElementWithTagName(*doc, child, "VALUE"){
|
||||||
|
if (child->hasAttribute("NAME") && child->hasAttribute("x") && child->hasAttribute("y")) {
|
||||||
|
String name = child->getStringAttribute("NAME");
|
||||||
|
int x = child->getIntAttribute("x");
|
||||||
|
int y = child->getIntAttribute("y");
|
||||||
|
int d = child->getIntAttribute("d");
|
||||||
|
int w = child->getIntAttribute("w");
|
||||||
|
int h = child->getIntAttribute("h");
|
||||||
|
DBG(" COmponent : " << name);
|
||||||
|
if (mappingComps[name] != nullptr){
|
||||||
|
if (dynamic_cast<Knob*>(mappingComps[name])){
|
||||||
|
mappingComps[name]->setBounds(transformBounds(x, y, d,d));
|
||||||
|
}
|
||||||
|
else if (dynamic_cast<ButtonList*>(mappingComps[name])){
|
||||||
|
mappingComps[name]->setBounds(transformBounds(x, y, w, h));
|
||||||
|
}
|
||||||
|
|
||||||
|
else if (dynamic_cast<TooglableButton*>(mappingComps[name])){
|
||||||
|
mappingComps[name]->setBounds(transformBounds(x, y, w, h));
|
||||||
|
}
|
||||||
|
else if (dynamic_cast<ImageMenu*>(mappingComps[name])){
|
||||||
|
mappingComps[name]->setBounds(transformBounds(x, y, d, d));
|
||||||
|
}
|
||||||
|
else if (dynamic_cast<ImageButton*>(mappingComps[name])){
|
||||||
|
mappingComps[name]->setBounds(transformBounds(x, y, w, h));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
void ObxdAudioProcessorEditor::loadSkin (ObxdAudioProcessor& ownerFilter)
|
void ObxdAudioProcessorEditor::loadSkin (ObxdAudioProcessor& ownerFilter)
|
||||||
{
|
{
|
||||||
|
|
@ -85,13 +146,14 @@ void ObxdAudioProcessorEditor::loadSkin (ObxdAudioProcessor& ownerFilter)
|
||||||
toggleAttachments.clear();
|
toggleAttachments.clear();
|
||||||
imageButtons.clear();
|
imageButtons.clear();
|
||||||
popupMenus.clear();
|
popupMenus.clear();
|
||||||
|
mappingComps.clear();
|
||||||
ownerFilter.removeChangeListener (this);
|
ownerFilter.removeChangeListener (this);
|
||||||
//File coords("/Users/jimmy/Downloads/coords.xml");
|
|
||||||
skinFolder = ownerFilter.getCurrentSkinFolder();
|
skinFolder = ownerFilter.getCurrentSkinFolder();
|
||||||
File coords = skinFolder.getChildFile ("coords.xml");
|
File coords = skinFolder.getChildFile ("coords.xml");
|
||||||
bool useClassicSkin = coords.existsAsFile();
|
bool useClassicSkin = coords.existsAsFile();
|
||||||
if (!useClassicSkin) {
|
if (!useClassicSkin) {
|
||||||
addMenuButton (14, 25, 20, ImageCache::getFromMemory(BinaryData::menu_png, BinaryData::menu_pngSize));
|
addMenuButton (14, 25, 20, "menu");
|
||||||
rebuildComponents (processor);
|
rebuildComponents (processor);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -126,125 +188,320 @@ void ObxdAudioProcessorEditor::loadSkin (ObxdAudioProcessor& ownerFilter)
|
||||||
else {
|
else {
|
||||||
setSize(xScreen, yScreen);
|
setSize(xScreen, yScreen);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (name == "resonanceKnob"){ resonanceKnob = addKnob (x, y, d, ownerFilter, RESONANCE, "Resonance", 0); }
|
if (name == "resonanceKnob"){
|
||||||
if (name == "cutoffKnob"){ cutoffKnob = addKnob (x, y, d, ownerFilter, CUTOFF, "Cutoff", 0.4); }
|
resonanceKnob = addKnob (x, y, d, ownerFilter, RESONANCE, "Resonance", 0);
|
||||||
if (name == "filterEnvelopeAmtKnob"){ filterEnvelopeAmtKnob = addKnob (x, y, d, ownerFilter, ENVELOPE_AMT, "Envelope", 0); }
|
mappingComps["resonanceKnob"] = resonanceKnob;
|
||||||
if (name == "multimodeKnob"){ multimodeKnob = addKnob (x, y, d, ownerFilter, MULTIMODE, "Multimode", 0.5); }
|
}
|
||||||
|
if (name == "cutoffKnob"){
|
||||||
|
cutoffKnob = addKnob (x, y, d, ownerFilter, CUTOFF, "Cutoff", 0.4);
|
||||||
|
mappingComps["cutoffKnob"] = cutoffKnob;
|
||||||
|
}
|
||||||
|
if (name == "filterEnvelopeAmtKnob"){
|
||||||
|
filterEnvelopeAmtKnob = addKnob (x, y, d, ownerFilter, ENVELOPE_AMT, "Envelope", 0);
|
||||||
|
mappingComps["filterEnvelopeAmtKnob"] = filterEnvelopeAmtKnob;
|
||||||
|
}
|
||||||
|
if (name == "multimodeKnob"){
|
||||||
|
multimodeKnob = addKnob (x, y, d, ownerFilter, MULTIMODE, "Multimode", 0.5);
|
||||||
|
mappingComps["multimodeKnob"] = multimodeKnob;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "volumeKnob"){ volumeKnob = addKnob (x, y, d, ownerFilter, VOLUME, "Volume", 0.4); }
|
if (name == "volumeKnob"){
|
||||||
if (name == "portamentoKnob"){ portamentoKnob = addKnob (x, y, d, ownerFilter, PORTAMENTO, "Portamento", 0); }
|
volumeKnob = addKnob (x, y, d, ownerFilter, VOLUME, "Volume", 0.4);
|
||||||
if (name == "osc1PitchKnob"){ osc1PitchKnob = addKnob (x, y, d, ownerFilter, OSC1P, "Osc1Pitch", 0); }
|
mappingComps["volumeKnob"] = volumeKnob;
|
||||||
if (name == "pulseWidthKnob"){ pulseWidthKnob = addKnob (x, y, d, ownerFilter, PW, "PW", 0); }
|
}
|
||||||
if (name == "osc2PitchKnob"){ osc2PitchKnob = addKnob (x, y, d, ownerFilter, OSC2P, "Osc2Pitch", 0); }
|
if (name == "portamentoKnob"){
|
||||||
|
portamentoKnob = addKnob (x, y, d, ownerFilter, PORTAMENTO, "Portamento", 0);
|
||||||
|
mappingComps["portamentoKnob"] = portamentoKnob;
|
||||||
|
}
|
||||||
|
if (name == "osc1PitchKnob"){
|
||||||
|
osc1PitchKnob = addKnob (x, y, d, ownerFilter, OSC1P, "Osc1Pitch", 0);
|
||||||
|
mappingComps["osc1PitchKnob"] = osc1PitchKnob;
|
||||||
|
}
|
||||||
|
if (name == "pulseWidthKnob"){
|
||||||
|
pulseWidthKnob = addKnob (x, y, d, ownerFilter, PW, "PW", 0);
|
||||||
|
mappingComps["pulseWidthKnob"] = pulseWidthKnob;
|
||||||
|
}
|
||||||
|
if (name == "osc2PitchKnob"){
|
||||||
|
osc2PitchKnob = addKnob (x, y, d, ownerFilter, OSC2P, "Osc2Pitch", 0);
|
||||||
|
mappingComps["osc2PitchKnob"] = osc2PitchKnob;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "osc1MixKnob"){ osc1MixKnob = addKnob (x, y, d, ownerFilter, OSC1MIX, "Osc1", 1); }
|
if (name == "osc1MixKnob"){
|
||||||
if (name == "osc2MixKnob"){ osc2MixKnob = addKnob (x, y, d, ownerFilter, OSC2MIX, "Osc2", 1); }
|
osc1MixKnob = addKnob (x, y, d, ownerFilter, OSC1MIX, "Osc1", 1);
|
||||||
if (name == "noiseMixKnob"){ noiseMixKnob = addKnob (x, y, d, ownerFilter, NOISEMIX, "Noise", 0); }
|
mappingComps["osc1MixKnob"] = osc1MixKnob;
|
||||||
|
}
|
||||||
|
if (name == "osc2MixKnob"){
|
||||||
|
osc2MixKnob = addKnob (x, y, d, ownerFilter, OSC2MIX, "Osc2", 1);
|
||||||
|
mappingComps["osc2MixKnob"] = osc2MixKnob;
|
||||||
|
}
|
||||||
|
if (name == "noiseMixKnob"){
|
||||||
|
noiseMixKnob = addKnob (x, y, d, ownerFilter, NOISEMIX, "Noise", 0);
|
||||||
|
mappingComps["noiseMixKnob"] = noiseMixKnob;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "xmodKnob"){ xmodKnob = addKnob (x, y, d, ownerFilter, XMOD, "Xmod", 0); }
|
if (name == "xmodKnob"){
|
||||||
if (name == "osc2DetuneKnob"){ osc2DetuneKnob = addKnob (x, y, d, ownerFilter, OSC2_DET, "Detune", 0); }
|
xmodKnob = addKnob (x, y, d, ownerFilter, XMOD, "Xmod", 0);
|
||||||
|
mappingComps["xmodKnob"] = xmodKnob;
|
||||||
|
}
|
||||||
|
if (name == "osc2DetuneKnob"){
|
||||||
|
osc2DetuneKnob = addKnob (x, y, d, ownerFilter, OSC2_DET, "Detune", 0);
|
||||||
|
mappingComps["osc2DetuneKnob"] = osc2DetuneKnob;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "envPitchModKnob"){ envPitchModKnob = addKnob (x, y, d, ownerFilter, ENVPITCH, "PEnv", 0); }
|
if (name == "envPitchModKnob"){
|
||||||
if (name == "brightnessKnob"){ brightnessKnob = addKnob (x, y, d, ownerFilter, BRIGHTNESS, "Bri", 1); }
|
envPitchModKnob = addKnob (x, y, d, ownerFilter, ENVPITCH, "PEnv", 0);
|
||||||
|
mappingComps["envPitchModKnob"] = envPitchModKnob;
|
||||||
|
}
|
||||||
|
if (name == "brightnessKnob"){
|
||||||
|
brightnessKnob = addKnob (x, y, d, ownerFilter, BRIGHTNESS, "Bri", 1);
|
||||||
|
mappingComps["brightnessKnob"] = brightnessKnob;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "attackKnob"){ attackKnob = addKnob (x, y, d, ownerFilter, LATK, "Atk", 0); }
|
if (name == "attackKnob"){
|
||||||
if (name == "decayKnob"){ decayKnob = addKnob (x, y, d, ownerFilter, LDEC, "Dec", 0); }
|
attackKnob = addKnob (x, y, d, ownerFilter, LATK, "Atk", 0);
|
||||||
if (name == "sustainKnob"){ sustainKnob = addKnob (x, y, d, ownerFilter, LSUS, "Sus", 1); }
|
mappingComps["attackKnob"] = attackKnob;
|
||||||
if (name == "releaseKnob"){ releaseKnob = addKnob (x, y, d, ownerFilter, LREL, "Rel", 0); }
|
}
|
||||||
|
if (name == "decayKnob"){ decayKnob = addKnob (x, y, d, ownerFilter, LDEC, "Dec", 0);
|
||||||
|
mappingComps["decayKnob"] = decayKnob;
|
||||||
|
}
|
||||||
|
if (name == "sustainKnob"){
|
||||||
|
sustainKnob = addKnob (x, y, d, ownerFilter, LSUS, "Sus", 1);
|
||||||
|
mappingComps["sustainKnob"] = sustainKnob;
|
||||||
|
}
|
||||||
|
if (name == "releaseKnob"){
|
||||||
|
releaseKnob = addKnob (x, y, d, ownerFilter, LREL, "Rel", 0);
|
||||||
|
mappingComps["releaseKnob"] = releaseKnob;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "fattackKnob"){ fattackKnob = addKnob (x, y, d, ownerFilter, FATK, "Atk", 0); }
|
if (name == "fattackKnob"){
|
||||||
if (name == "fdecayKnob"){ fdecayKnob = addKnob (x, y, d, ownerFilter, FDEC, "Dec", 0); }
|
fattackKnob = addKnob (x, y, d, ownerFilter, FATK, "Atk", 0);
|
||||||
if (name == "fsustainKnob"){ fsustainKnob = addKnob (x, y, d, ownerFilter, FSUS, "Sus", 1); }
|
mappingComps["fattackKnob"] = fattackKnob;
|
||||||
if (name == "freleaseKnob"){ freleaseKnob = addKnob (x, y, d, ownerFilter, FREL, "Rel", 0); }
|
}
|
||||||
|
if (name == "fdecayKnob"){
|
||||||
|
fdecayKnob = addKnob (x, y, d, ownerFilter, FDEC, "Dec", 0);
|
||||||
|
mappingComps["fdecayKnob"] = fdecayKnob;
|
||||||
|
}
|
||||||
|
if (name == "fsustainKnob"){
|
||||||
|
fsustainKnob = addKnob (x, y, d, ownerFilter, FSUS, "Sus", 1);
|
||||||
|
mappingComps["fsustainKnob"] = fsustainKnob;
|
||||||
|
}
|
||||||
|
if (name == "freleaseKnob"){
|
||||||
|
freleaseKnob = addKnob (x, y, d, ownerFilter, FREL, "Rel", 0);
|
||||||
|
mappingComps["freleaseKnob"] = freleaseKnob;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "lfoFrequencyKnob"){ lfoFrequencyKnob = addKnob (x, y, d, ownerFilter, LFOFREQ, "Freq", 0); }
|
if (name == "lfoFrequencyKnob"){
|
||||||
if (name == "lfoAmt1Knob"){ lfoAmt1Knob = addKnob (x, y, d, ownerFilter, LFO1AMT, "Pitch", 0); }
|
lfoFrequencyKnob = addKnob (x, y, d, ownerFilter, LFOFREQ, "Freq", 0);
|
||||||
if (name == "lfoAmt2Knob"){ lfoAmt2Knob = addKnob (x, y, d, ownerFilter, LFO2AMT, "PWM", 0); }
|
mappingComps["lfoFrequencyKnob"] = lfoFrequencyKnob;
|
||||||
|
}
|
||||||
|
if (name == "lfoAmt1Knob"){
|
||||||
|
lfoAmt1Knob = addKnob (x, y, d, ownerFilter, LFO1AMT, "Pitch", 0);
|
||||||
|
mappingComps["lfoAmt1Knob"] = lfoAmt1Knob;
|
||||||
|
}
|
||||||
|
if (name == "lfoAmt2Knob"){
|
||||||
|
lfoAmt2Knob = addKnob (x, y, d, ownerFilter, LFO2AMT, "PWM", 0);
|
||||||
|
mappingComps["lfoAmt2Knob"] = lfoAmt2Knob;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "lfoSinButton"){ lfoSinButton = addButton (x, y, w, h, ownerFilter, LFOSINWAVE, "Sin"); }
|
if (name == "lfoSinButton"){
|
||||||
if (name == "lfoSquareButton"){ lfoSquareButton = addButton (x, y, w, h, ownerFilter, LFOSQUAREWAVE, "SQ"); }
|
lfoSinButton = addButton (x, y, w, h, ownerFilter, LFOSINWAVE, "Sin");
|
||||||
if (name == "lfoSHButton"){ lfoSHButton = addButton (x, y, w, h, ownerFilter, LFOSHWAVE, "S&H"); }
|
mappingComps["lfoSinButton"] = lfoSinButton;
|
||||||
|
}
|
||||||
|
if (name == "lfoSquareButton"){
|
||||||
|
lfoSquareButton = addButton (x, y, w, h, ownerFilter, LFOSQUAREWAVE, "SQ");
|
||||||
|
mappingComps["lfoSquareButton"] = lfoSquareButton;
|
||||||
|
}
|
||||||
|
if (name == "lfoSHButton"){
|
||||||
|
lfoSHButton = addButton (x, y, w, h, ownerFilter, LFOSHWAVE, "S&H");
|
||||||
|
mappingComps["lfoSHButton"] = lfoSHButton;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "lfoOsc1Button"){ lfoOsc1Button = addButton (x, y, w, h, ownerFilter, LFOOSC1, "Osc1"); }
|
if (name == "lfoOsc1Button"){
|
||||||
if (name == "lfoOsc2Button"){ lfoOsc2Button = addButton (x, y, w, h, ownerFilter, LFOOSC2, "Osc2"); }
|
lfoOsc1Button = addButton (x, y, w, h, ownerFilter, LFOOSC1, "Osc1");
|
||||||
if (name == "lfoFilterButton"){ lfoFilterButton = addButton (x, y, w, h, ownerFilter, LFOFILTER, "Filt"); }
|
mappingComps["lfoOsc1Button"] = lfoOsc1Button;
|
||||||
|
}
|
||||||
|
if (name == "lfoOsc2Button"){
|
||||||
|
lfoOsc2Button = addButton (x, y, w, h, ownerFilter, LFOOSC2, "Osc2");
|
||||||
|
mappingComps["lfoOsc2Button"] = lfoOsc2Button;
|
||||||
|
}
|
||||||
|
if (name == "lfoFilterButton"){
|
||||||
|
lfoFilterButton = addButton (x, y, w, h, ownerFilter, LFOFILTER, "Filt");
|
||||||
|
mappingComps["lfoFilterButton"] = lfoFilterButton;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "lfoPwm1Button"){ lfoPwm1Button = addButton (x, y, w, h, ownerFilter, LFOPW1, "Osc1"); }
|
if (name == "lfoPwm1Button"){
|
||||||
if (name == "lfoPwm2Button"){ lfoPwm2Button = addButton (x, y, w, h, ownerFilter, LFOPW2, "Osc2"); }
|
lfoPwm1Button = addButton (x, y, w, h, ownerFilter, LFOPW1, "Osc1");
|
||||||
|
mappingComps["lfoPwm1Button"] = lfoPwm1Button;
|
||||||
|
|
||||||
|
}
|
||||||
|
if (name == "lfoPwm2Button"){
|
||||||
|
lfoPwm2Button = addButton (x, y, w, h, ownerFilter, LFOPW2, "Osc2");
|
||||||
|
mappingComps["lfoPwm2Button"] = lfoPwm2Button;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "hardSyncButton"){ hardSyncButton = addButton (x, y, w, h, ownerFilter, OSC2HS, "Sync"); }
|
if (name == "hardSyncButton"){
|
||||||
if (name == "osc1SawButton"){ osc1SawButton = addButton (x, y, w, h, ownerFilter, OSC1Saw, "S"); }
|
hardSyncButton = addButton (x, y, w, h, ownerFilter, OSC2HS, "Sync");
|
||||||
if (name == "osc2SawButton"){ osc2SawButton = addButton (x, y, w, h, ownerFilter, OSC2Saw, "S"); }
|
mappingComps["hardSyncButton"] = hardSyncButton;
|
||||||
|
}
|
||||||
|
if (name == "osc1SawButton"){
|
||||||
|
osc1SawButton = addButton (x, y, w, h, ownerFilter, OSC1Saw, "S");
|
||||||
|
mappingComps["osc1SawButton"] = osc1SawButton;
|
||||||
|
}
|
||||||
|
if (name == "osc2SawButton"){
|
||||||
|
osc2SawButton = addButton (x, y, w, h, ownerFilter, OSC2Saw, "S");
|
||||||
|
mappingComps["osc2SawButton"] = osc2SawButton;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "osc1PulButton"){ osc1PulButton = addButton (x, y, w, h, ownerFilter, OSC1Pul, "P"); }
|
if (name == "osc1PulButton"){
|
||||||
if (name == "osc2PulButton"){ osc2PulButton = addButton (x, y, w, h, ownerFilter, OSC2Pul, "P"); }
|
osc1PulButton = addButton (x, y, w, h, ownerFilter, OSC1Pul, "P");
|
||||||
|
mappingComps["osc1PulButton"] = osc1PulButton;
|
||||||
|
}
|
||||||
|
if (name == "osc2PulButton"){
|
||||||
|
osc2PulButton = addButton (x, y, w, h, ownerFilter, OSC2Pul, "P");
|
||||||
|
mappingComps["osc2PulButton"] = osc2PulButton;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "pitchQuantButton"){ pitchQuantButton = addButton (x, y, w, h, ownerFilter, OSCQuantize, "Step"); }
|
if (name == "pitchQuantButton"){
|
||||||
|
pitchQuantButton = addButton (x, y, w, h, ownerFilter, OSCQuantize, "Step");
|
||||||
|
mappingComps["pitchQuantButton"] = pitchQuantButton;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "filterBPBlendButton"){ filterBPBlendButton = addButton (x, y, w, h, ownerFilter, BANDPASS, "Bp"); }
|
if (name == "filterBPBlendButton"){
|
||||||
if (name == "fourPoleButton"){ fourPoleButton = addButton (x, y, w, h, ownerFilter, FOURPOLE, "24"); }
|
filterBPBlendButton = addButton (x, y, w, h, ownerFilter, BANDPASS, "Bp");
|
||||||
if (name == "filterHQButton"){ filterHQButton = addButton (x, y, w, h, ownerFilter, FILTER_WARM, "HQ"); }
|
mappingComps["filterBPBlendButton"] = filterBPBlendButton;
|
||||||
|
}
|
||||||
|
if (name == "fourPoleButton"){
|
||||||
|
fourPoleButton = addButton (x, y, w, h, ownerFilter, FOURPOLE, "24");
|
||||||
|
mappingComps["fourPoleButton"] = fourPoleButton;
|
||||||
|
}
|
||||||
|
if (name == "filterHQButton"){
|
||||||
|
filterHQButton = addButton (x, y, w, h, ownerFilter, FILTER_WARM, "HQ");
|
||||||
|
mappingComps["filterHQButton"] = filterHQButton;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "filterKeyFollowButton"){ filterKeyFollowButton = addButton (x, y, w, h, ownerFilter, FLT_KF, "Key"); }
|
if (name == "filterKeyFollowButton"){
|
||||||
if (name == "unisonButton"){ unisonButton = addButton (x, y, w, h, ownerFilter, UNISON, "Uni"); }
|
filterKeyFollowButton = addButton (x, y, w, h, ownerFilter, FLT_KF, "Key");
|
||||||
|
mappingComps["filterKeyFollowButton"] = filterKeyFollowButton;
|
||||||
|
}
|
||||||
|
if (name == "unisonButton"){
|
||||||
|
unisonButton = addButton (x, y, w, h, ownerFilter, UNISON, "Uni");
|
||||||
|
mappingComps["unisonButton"] = unisonButton;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "tuneKnob"){ tuneKnob = addKnob (x, y, d, ownerFilter, TUNE, "Tune", 0.5); }
|
if (name == "tuneKnob"){
|
||||||
if (name == "transposeKnob"){ transposeKnob = addKnob (x, y, d, ownerFilter, OCTAVE, "Transpose", 0.5); }
|
tuneKnob = addKnob (x, y, d, ownerFilter, TUNE, "Tune", 0.5);
|
||||||
|
mappingComps["tuneKnob"] = tuneKnob;
|
||||||
|
}
|
||||||
|
if (name == "transposeKnob"){
|
||||||
|
transposeKnob = addKnob (x, y, d, ownerFilter, OCTAVE, "Transpose", 0.5);
|
||||||
|
mappingComps["transposeKnob"] = transposeKnob;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "voiceDetuneKnob"){ voiceDetuneKnob =addKnob (x, y, d, ownerFilter, UDET, "VoiceDet", 0); }
|
if (name == "voiceDetuneKnob"){
|
||||||
|
voiceDetuneKnob =addKnob (x, y, d, ownerFilter, UDET, "VoiceDet", 0);
|
||||||
|
mappingComps["voiceDetuneKnob"] = voiceDetuneKnob;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "bendLfoRateKnob"){ bendLfoRateKnob = addKnob (x, y, d, ownerFilter, BENDLFORATE, "ModRate", 0.4); }
|
if (name == "bendLfoRateKnob"){
|
||||||
if (name == "veloFltEnvKnob"){ veloFltEnvKnob = addKnob (x, y, d, ownerFilter, VFLTENV, "VFE", 0); }
|
bendLfoRateKnob = addKnob (x, y, d, ownerFilter, BENDLFORATE, "ModRate", 0.4);
|
||||||
if (name == "veloAmpEnvKnob"){ veloAmpEnvKnob = addKnob (x, y, d, ownerFilter, VAMPENV, "VAE", 0); }
|
mappingComps["bendLfoRateKnob"] = bendLfoRateKnob;
|
||||||
if (name == "midiLearnButton"){ midiLearnButton = addButton (x, y, w, h, ownerFilter, MIDILEARN, "LEA"); }
|
}
|
||||||
if (name == "midiUnlearnButton"){ midiUnlearnButton = addButton (x, y, w, h, ownerFilter, UNLEARN, "UNL"); }
|
if (name == "veloFltEnvKnob"){
|
||||||
|
veloFltEnvKnob = addKnob (x, y, d, ownerFilter, VFLTENV, "VFE", 0);
|
||||||
|
mappingComps["veloFltEnvKnob"] = veloFltEnvKnob;
|
||||||
|
}
|
||||||
|
if (name == "veloAmpEnvKnob"){
|
||||||
|
veloAmpEnvKnob = addKnob (x, y, d, ownerFilter, VAMPENV, "VAE", 0);
|
||||||
|
mappingComps["veloAmpEnvKnob"] = veloAmpEnvKnob;
|
||||||
|
}
|
||||||
|
if (name == "midiLearnButton"){
|
||||||
|
midiLearnButton = addButton (x, y, w, h, ownerFilter, MIDILEARN, "LEA");
|
||||||
|
mappingComps["midiLearnButton"] = midiLearnButton;
|
||||||
|
}
|
||||||
|
if (name == "midiUnlearnButton"){
|
||||||
|
midiUnlearnButton = addButton (x, y, w, h, ownerFilter, UNLEARN, "UNL");
|
||||||
|
mappingComps["midiUnlearnButton"] = midiUnlearnButton;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "pan1Knob"){ pan1Knob = addKnob (x, y, d, ownerFilter, PAN1, "1", 0.5); }
|
if (name == "pan1Knob"){
|
||||||
if (name == "pan2Knob"){ pan2Knob = addKnob (x, y, d, ownerFilter, PAN2, "2", 0.5); }
|
pan1Knob = addKnob (x, y, d, ownerFilter, PAN1, "1", 0.5);
|
||||||
if (name == "pan3Knob"){ pan3Knob = addKnob (x, y, d, ownerFilter, PAN3, "3", 0.5); }
|
mappingComps["pan1Knob"] = pan1Knob;
|
||||||
if (name == "pan4Knob"){ pan4Knob = addKnob (x, y, d, ownerFilter, PAN4, "4", 0.5); }
|
}
|
||||||
|
if (name == "pan2Knob"){
|
||||||
|
pan2Knob = addKnob (x, y, d, ownerFilter, PAN2, "2", 0.5);
|
||||||
|
mappingComps["pan2Knob"] = pan2Knob;
|
||||||
|
}
|
||||||
|
if (name == "pan3Knob"){
|
||||||
|
pan3Knob = addKnob (x, y, d, ownerFilter, PAN3, "3", 0.5);
|
||||||
|
mappingComps["pan3Knob"] = pan3Knob;
|
||||||
|
}
|
||||||
|
if (name == "pan4Knob"){
|
||||||
|
pan4Knob = addKnob (x, y, d, ownerFilter, PAN4, "4", 0.5);
|
||||||
|
mappingComps["pan4Knob"] = pan4Knob;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "pan5Knob"){ pan5Knob = addKnob (x, y, d, ownerFilter, PAN5, "5", 0.5); }
|
if (name == "pan5Knob"){
|
||||||
if (name == "pan6Knob"){ pan6Knob = addKnob (x, y, d, ownerFilter, PAN6, "6", 0.5); }
|
pan5Knob = addKnob (x, y, d, ownerFilter, PAN5, "5", 0.5);
|
||||||
if (name == "pan7Knob"){ pan7Knob = addKnob (x, y, d, ownerFilter, PAN7, "7", 0.5); }
|
mappingComps["pan5Knob"] = pan5Knob;
|
||||||
if (name == "pan8Knob"){ pan8Knob = addKnob (x, y, d, ownerFilter, PAN8, "8", 0.5); }
|
}
|
||||||
|
if (name == "pan6Knob"){
|
||||||
|
pan6Knob = addKnob (x, y, d, ownerFilter, PAN6, "6", 0.5);
|
||||||
|
mappingComps["pan6Knob"] = pan6Knob;
|
||||||
|
}
|
||||||
|
if (name == "pan7Knob"){
|
||||||
|
pan7Knob = addKnob (x, y, d, ownerFilter, PAN7, "7", 0.5);
|
||||||
|
mappingComps["pan7Knob"] = pan7Knob;
|
||||||
|
}
|
||||||
|
if (name == "pan8Knob"){
|
||||||
|
pan8Knob = addKnob (x, y, d, ownerFilter, PAN8, "8", 0.5);
|
||||||
|
mappingComps["pan8Knob"] = pan8Knob;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "bendOsc2OnlyButton"){ bendOsc2OnlyButton = addButton (x, y, w, h, ownerFilter, BENDOSC2, "Osc2"); }
|
if (name == "bendOsc2OnlyButton"){
|
||||||
if (name == "bendRangeButton"){ bendRangeButton = addButton (x, y, w, h, ownerFilter, BENDRANGE, "12"); }
|
bendOsc2OnlyButton = addButton (x, y, w, h, ownerFilter, BENDOSC2, "Osc2");
|
||||||
if (name == "asPlayedAllocButton"){ asPlayedAllocButton = addButton (x, y, w, h, ownerFilter, ASPLAYEDALLOCATION, "APA"); }
|
mappingComps["bendOsc2OnlyButton"] = bendOsc2OnlyButton;
|
||||||
|
}
|
||||||
|
if (name == "bendRangeButton"){
|
||||||
|
bendRangeButton = addButton (x, y, w, h, ownerFilter, BENDRANGE, "12");
|
||||||
|
mappingComps["bendRangeButton"] = bendRangeButton;
|
||||||
|
}
|
||||||
|
if (name == "asPlayedAllocButton"){
|
||||||
|
asPlayedAllocButton = addButton (x, y, w, h, ownerFilter, ASPLAYEDALLOCATION, "APA");
|
||||||
|
mappingComps["asPlayedAllocButton"] = asPlayedAllocButton;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "filterDetuneKnob"){ filterDetuneKnob = addKnob (x, y, d, ownerFilter, FILTERDER, "Flt", 0.2); }
|
if (name == "filterDetuneKnob"){
|
||||||
if (name == "portamentoDetuneKnob"){ portamentoDetuneKnob = addKnob (x, y, d, ownerFilter, PORTADER, "Port", 0.2); }
|
filterDetuneKnob = addKnob (x, y, d, ownerFilter, FILTERDER, "Flt", 0.2);
|
||||||
if (name == "envelopeDetuneKnob"){ envelopeDetuneKnob = addKnob (x, y, d, ownerFilter, ENVDER, "Env", 0.2); }
|
mappingComps["filterDetuneKnob"] = filterDetuneKnob;
|
||||||
|
}
|
||||||
|
if (name == "portamentoDetuneKnob"){
|
||||||
|
portamentoDetuneKnob = addKnob (x, y, d, ownerFilter, PORTADER, "Port", 0.2);
|
||||||
|
mappingComps["portamentoDetuneKnob"] = portamentoDetuneKnob;
|
||||||
|
}
|
||||||
|
if (name == "envelopeDetuneKnob"){
|
||||||
|
envelopeDetuneKnob = addKnob (x, y, d, ownerFilter, ENVDER, "Env", 0.2);
|
||||||
|
mappingComps["envelopeDetuneKnob"] = envelopeDetuneKnob;
|
||||||
|
}
|
||||||
|
|
||||||
if (name == "voiceSwitch"){
|
if (name == "voiceSwitch"){
|
||||||
//if (voiceSwitch) voiceSwitch->setVisible(false);
|
voiceSwitch = addList (x, y, w, h, ownerFilter, VOICE_COUNT, "VoiceCount", "voices");
|
||||||
#if JUCE_WINDOWS || JUCE_LINUX
|
mappingComps["voiceSwitch"] = voiceSwitch;
|
||||||
voiceSwitch = addList (x, y, w, h, ownerFilter, VOICE_COUNT, "VoiceCount", ImageCache::getFromFile(skinFolder.getChildFile("voices.png"))); }
|
}
|
||||||
#else
|
|
||||||
voiceSwitch = addList (x, y, w, h, ownerFilter, VOICE_COUNT, "VoiceCount", ImageCache::getFromFile(skinFolder.getChildFile("voices@2x.png"))); }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (name == "legatoSwitch"){
|
if (name == "legatoSwitch"){
|
||||||
//if (legatoSwitch) legatoSwitch->setVisible(false);
|
legatoSwitch = addList (x, y, w, h, ownerFilter, LEGATOMODE, "Legato", "legato");
|
||||||
#if JUCE_WINDOWS || JUCE_LINUX
|
mappingComps["legatoSwitch"] = legatoSwitch;
|
||||||
legatoSwitch = addList (x, y, w, h, ownerFilter, LEGATOMODE, "Legato", ImageCache::getFromFile(skinFolder.getChildFile("legato.png"))); }
|
}
|
||||||
#else
|
|
||||||
legatoSwitch = addList (x, y, w, h, ownerFilter, LEGATOMODE, "Legato", ImageCache::getFromFile(skinFolder.getChildFile("legato@2x.png"))); }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
if (name == "menu")
|
if (name == "menu")
|
||||||
{
|
{
|
||||||
addMenuButton (x, y, d,
|
ImageButton *img = addMenuButton (x, y, d, "menu");
|
||||||
#if JUCE_WINDOWS || JUCE_LINUX
|
mappingComps["menu"] = img;
|
||||||
ImageCache::getFromFile (skinFolder.getChildFile ("menu.png")));
|
|
||||||
#else
|
|
||||||
ImageCache::getFromFile (skinFolder.getChildFile ("menu@2x.png")));
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//DBG(" Name: " << name << " X: " <<x <<" Y: "<<y);
|
//DBG(" Name: " << name << " X: " <<x <<" Y: "<<y);
|
||||||
|
|
@ -256,11 +513,6 @@ void ObxdAudioProcessorEditor::loadSkin (ObxdAudioProcessor& ownerFilter)
|
||||||
presetBar.reset(new PresetBar(*this));
|
presetBar.reset(new PresetBar(*this));
|
||||||
addAndMakeVisible(*presetBar);
|
addAndMakeVisible(*presetBar);
|
||||||
presetBar->setVisible(processor.getShowPresetBar());
|
presetBar->setVisible(processor.getShowPresetBar());
|
||||||
|
|
||||||
|
|
||||||
presetBar->setBounds(
|
|
||||||
(xScreen - presetBar->getWidth()) / 2, yScreen, presetBar->getWidth(), presetBar->getHeight());
|
|
||||||
|
|
||||||
updatePresetBar(false);
|
updatePresetBar(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -289,8 +541,8 @@ void ObxdAudioProcessorEditor::loadSkin (ObxdAudioProcessor& ownerFilter)
|
||||||
createMenu();
|
createMenu();
|
||||||
|
|
||||||
ownerFilter.addChangeListener (this);
|
ownerFilter.addChangeListener (this);
|
||||||
|
|
||||||
|
scaleFactorChanged();
|
||||||
repaint();
|
repaint();
|
||||||
}
|
}
|
||||||
ObxdAudioProcessorEditor::~ObxdAudioProcessorEditor()
|
ObxdAudioProcessorEditor::~ObxdAudioProcessorEditor()
|
||||||
|
|
@ -299,6 +551,74 @@ ObxdAudioProcessorEditor::~ObxdAudioProcessorEditor()
|
||||||
// deleteAllChildren(); // WATCH OUT!
|
// deleteAllChildren(); // WATCH OUT!
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ObxdAudioProcessorEditor::scaleFactorChanged()
|
||||||
|
{
|
||||||
|
// update background
|
||||||
|
const bool highResolutionDisplay = isHighResolutionDisplay();
|
||||||
|
const float scaleFactor = getScaleFactor();
|
||||||
|
|
||||||
|
// notify child components
|
||||||
|
for (int i = 0; i < getNumChildComponents(); i++)
|
||||||
|
{
|
||||||
|
ScalableComponent* object =
|
||||||
|
dynamic_cast<ScalableComponent*>(getChildComponent(i));
|
||||||
|
|
||||||
|
if (object != nullptr)
|
||||||
|
{
|
||||||
|
object->setScaleFactor(scaleFactor, highResolutionDisplay);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// update look and feel
|
||||||
|
|
||||||
|
// redraw everything
|
||||||
|
backgroundImage = getScaledImageFromCache("main", scaleFactor, highResolutionDisplay);
|
||||||
|
|
||||||
|
int width = backgroundImage.getWidth();
|
||||||
|
int height = backgroundImage.getHeight();
|
||||||
|
|
||||||
|
|
||||||
|
if (!highResolutionDisplay)
|
||||||
|
{
|
||||||
|
if (scaleFactor == 1.5f)
|
||||||
|
{
|
||||||
|
width = roundFloatToInt(width * 0.75f);
|
||||||
|
height = roundFloatToInt(height * 0.75f);
|
||||||
|
|
||||||
|
}
|
||||||
|
else if (scaleFactor == 2.0f)
|
||||||
|
{
|
||||||
|
width /= 2;
|
||||||
|
height /= 2;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (scaleFactor == 1.0f) //2x image
|
||||||
|
{
|
||||||
|
width /= 2;
|
||||||
|
height /= 2;
|
||||||
|
}
|
||||||
|
else if (scaleFactor == 1.5f) //4x images =>150%
|
||||||
|
{
|
||||||
|
width = roundFloatToInt(width * (0.25f + 0.125f));
|
||||||
|
height = roundFloatToInt(height * (0.25f + 0.125f));
|
||||||
|
|
||||||
|
}
|
||||||
|
else if (scaleFactor == 2.0f) //4x images =>200x
|
||||||
|
{
|
||||||
|
width /= 2;
|
||||||
|
height /= 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (processor.getShowPresetBar())
|
||||||
|
{
|
||||||
|
setSize(width, height + presetBar->getHeight());
|
||||||
|
presetBar->setBounds((width - presetBar->getWidth()) / 2, height, presetBar->getWidth(), presetBar->getHeight());
|
||||||
|
} else
|
||||||
|
setSize(width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void ObxdAudioProcessorEditor::placeLabel (int x, int y, String text)
|
void ObxdAudioProcessorEditor::placeLabel (int x, int y, String text)
|
||||||
{
|
{
|
||||||
Label* lab = new Label();
|
Label* lab = new Label();
|
||||||
|
|
@ -309,12 +629,12 @@ void ObxdAudioProcessorEditor::placeLabel (int x, int y, String text)
|
||||||
addAndMakeVisible (lab);
|
addAndMakeVisible (lab);
|
||||||
}
|
}
|
||||||
|
|
||||||
ButtonList* ObxdAudioProcessorEditor::addList (int x, int y, int width, int height, ObxdAudioProcessor& filter, int parameter, String /*name*/, Image img)
|
ButtonList* ObxdAudioProcessorEditor::addList (int x, int y, int width, int height, ObxdAudioProcessor& filter, int parameter, String /*name*/, String imgName)
|
||||||
{
|
{
|
||||||
#if JUCE_WINDOWS || JUCE_LINUX
|
#if JUCE_WINDOWS || JUCE_LINUX
|
||||||
ButtonList *bl = new ButtonList (img, height);
|
ButtonList *bl = new ButtonList (imgName, height, &processor);
|
||||||
#else
|
#else
|
||||||
ButtonList *bl = new ButtonList (img, height*2);
|
ButtonList *bl = new ButtonList (imgName, height, &processor);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
buttonListAttachments.add (new ButtonList::ButtonListAttachment (filter.getPluginState(),
|
buttonListAttachments.add (new ButtonList::ButtonListAttachment (filter.getPluginState(),
|
||||||
|
|
@ -330,11 +650,9 @@ ButtonList* ObxdAudioProcessorEditor::addList (int x, int y, int width, int heig
|
||||||
|
|
||||||
Knob* ObxdAudioProcessorEditor::addKnob (int x, int y, int d, ObxdAudioProcessor& filter, int parameter, String /*name*/, float defval)
|
Knob* ObxdAudioProcessorEditor::addKnob (int x, int y, int d, ObxdAudioProcessor& filter, int parameter, String /*name*/, float defval)
|
||||||
{
|
{
|
||||||
#if JUCE_WINDOWS || JUCE_LINUX
|
|
||||||
Knob* knob = new Knob (ImageCache::getFromFile(skinFolder.getChildFile("knob.png")), 48);
|
Knob* knob = new Knob ("knob", 48, &processor);
|
||||||
#else
|
|
||||||
Knob* knob = new Knob (ImageCache::getFromFile(skinFolder.getChildFile("knob@2x.png")), 96);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
knobAttachments.add (new Knob::KnobAttachment (filter.getPluginState(),
|
knobAttachments.add (new Knob::KnobAttachment (filter.getPluginState(),
|
||||||
filter.getEngineParameterId (parameter),
|
filter.getEngineParameterId (parameter),
|
||||||
|
|
@ -360,11 +678,8 @@ void ObxdAudioProcessorEditor::clean()
|
||||||
|
|
||||||
TooglableButton* ObxdAudioProcessorEditor::addButton (int x, int y, int w, int h, ObxdAudioProcessor& filter, int parameter, String name)
|
TooglableButton* ObxdAudioProcessorEditor::addButton (int x, int y, int w, int h, ObxdAudioProcessor& filter, int parameter, String name)
|
||||||
{
|
{
|
||||||
#if JUCE_WINDOWS || JUCE_LINUX
|
TooglableButton* button = new TooglableButton ("button", &processor);
|
||||||
TooglableButton* button = new TooglableButton (ImageCache::getFromFile(skinFolder.getChildFile("button.png")));
|
|
||||||
#else
|
|
||||||
TooglableButton* button = new TooglableButton (ImageCache::getFromFile(skinFolder.getChildFile("button@2x.png")));
|
|
||||||
#endif
|
|
||||||
if (parameter != UNLEARN){
|
if (parameter != UNLEARN){
|
||||||
toggleAttachments.add (new AudioProcessorValueTreeState::ButtonAttachment (filter.getPluginState(),
|
toggleAttachments.add (new AudioProcessorValueTreeState::ButtonAttachment (filter.getPluginState(),
|
||||||
filter.getEngineParameterId (parameter),
|
filter.getEngineParameterId (parameter),
|
||||||
|
|
@ -381,26 +696,21 @@ TooglableButton* ObxdAudioProcessorEditor::addButton (int x, int y, int w, int h
|
||||||
|
|
||||||
return button;
|
return button;
|
||||||
}
|
}
|
||||||
|
Rectangle<int> ObxdAudioProcessorEditor::transformBounds(int x, int y, int w, int h)
|
||||||
void ObxdAudioProcessorEditor::addMenuButton (int x, int y, int d, const Image& image)
|
{
|
||||||
|
if (getScaleFactor() == 1.0f)
|
||||||
|
return Rectangle<int>(x, y, w, h);
|
||||||
|
|
||||||
|
return Rectangle<int>(x, y, w, h).toFloat().transformedBy(AffineTransform::scale(getScaleFactor())).toNearestInt();
|
||||||
|
}
|
||||||
|
ImageButton* ObxdAudioProcessorEditor::addMenuButton (int x, int y, int d, String imgName)
|
||||||
{
|
{
|
||||||
ImageButton* imageButton;
|
|
||||||
imageButtons.add (imageButton = new ImageButton());
|
|
||||||
imageButton->setBounds (x, y, d, d);
|
|
||||||
imageButton->setImages (false,
|
|
||||||
true,
|
|
||||||
true,
|
|
||||||
image,
|
|
||||||
1.0f, // menu transparency
|
|
||||||
Colour(),
|
|
||||||
image,
|
|
||||||
1.0f, // menu hover transparency
|
|
||||||
Colour(),
|
|
||||||
image,
|
|
||||||
0.3f, // menu click transparency
|
|
||||||
Colour());
|
|
||||||
|
|
||||||
//imageButton->addListener (this);
|
ImageMenu* imageButton = new ImageMenu(imgName, &processor);
|
||||||
|
imageButtons.add (imageButton);
|
||||||
|
imageButton->setBounds (x, y, d, d);
|
||||||
|
|
||||||
|
|
||||||
imageButton->onClick = [this](){
|
imageButton->onClick = [this](){
|
||||||
ImageButton *imageButton = this->imageButtons[0];
|
ImageButton *imageButton = this->imageButtons[0];
|
||||||
auto x = imageButton->getScreenX();
|
auto x = imageButton->getScreenX();
|
||||||
|
|
@ -410,6 +720,7 @@ void ObxdAudioProcessorEditor::addMenuButton (int x, int y, int d, const Image&
|
||||||
resultFromMenu (pos);
|
resultFromMenu (pos);
|
||||||
};
|
};
|
||||||
addAndMakeVisible (imageButton);
|
addAndMakeVisible (imageButton);
|
||||||
|
return imageButton;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ObxdAudioProcessorEditor::rebuildComponents (ObxdAudioProcessor& ownerFilter)
|
void ObxdAudioProcessorEditor::rebuildComponents (ObxdAudioProcessor& ownerFilter)
|
||||||
|
|
@ -420,10 +731,11 @@ void ObxdAudioProcessorEditor::rebuildComponents (ObxdAudioProcessor& ownerFilte
|
||||||
|
|
||||||
// deleteAllChildren(); // WATCH OUT!
|
// deleteAllChildren(); // WATCH OUT!
|
||||||
|
|
||||||
setSize (1440, 450);
|
setSize (1440, 450);
|
||||||
|
|
||||||
ownerFilter.addChangeListener (this);
|
ownerFilter.addChangeListener (this);
|
||||||
repaint();
|
repaint();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ObxdAudioProcessorEditor::createMenu ()
|
void ObxdAudioProcessorEditor::createMenu ()
|
||||||
|
|
@ -539,6 +851,13 @@ void ObxdAudioProcessorEditor::createMenu ()
|
||||||
createMidi(menuMidiNum, midiMenu);
|
createMidi(menuMidiNum, midiMenu);
|
||||||
menu->addSubMenu ("MIDI", midiMenu);
|
menu->addSubMenu ("MIDI", midiMenu);
|
||||||
popupMenus.add (menu);
|
popupMenus.add (menu);
|
||||||
|
|
||||||
|
PopupMenu scaleMenu;
|
||||||
|
menuScaleNum =progStart +2000 + 3000;
|
||||||
|
scaleMenu.addItem(menuScaleNum, "1x", true, getScaleFactor() == 1.0f);
|
||||||
|
scaleMenu.addItem(menuScaleNum+1, "1.5x", true, getScaleFactor() == 1.5f);
|
||||||
|
scaleMenu.addItem(menuScaleNum+2, "2x", true, getScaleFactor() == 2.0f);
|
||||||
|
menu->addSubMenu("GUI Size", scaleMenu, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ObxdAudioProcessorEditor::createMidi(int menuNo, PopupMenu &menuMidi) {
|
void ObxdAudioProcessorEditor::createMidi(int menuNo, PopupMenu &menuMidi) {
|
||||||
|
|
@ -629,6 +948,21 @@ void ObxdAudioProcessorEditor::resultFromMenu (const Point<int> pos)
|
||||||
//createMenu();
|
//createMenu();
|
||||||
updatePresetBar();
|
updatePresetBar();
|
||||||
}
|
}
|
||||||
|
else if (result >= menuScaleNum){
|
||||||
|
|
||||||
|
if (result ==menuScaleNum){
|
||||||
|
ScalableComponent::setScaleFactor(1.0f, isHighResolutionDisplay());
|
||||||
|
processor.setGuiSize(1);
|
||||||
|
}
|
||||||
|
else if (result == menuScaleNum+1){
|
||||||
|
ScalableComponent::setScaleFactor(1.5f, isHighResolutionDisplay());
|
||||||
|
processor.setGuiSize(2);
|
||||||
|
}
|
||||||
|
else if (result == menuScaleNum+2) {
|
||||||
|
ScalableComponent::setScaleFactor(2.0f, isHighResolutionDisplay());
|
||||||
|
processor.setGuiSize(4);
|
||||||
|
}
|
||||||
|
}
|
||||||
else if (result >= menuMidiNum){
|
else if (result >= menuMidiNum){
|
||||||
unsigned int selected_idx = result - menuMidiNum;
|
unsigned int selected_idx = result - menuMidiNum;
|
||||||
if (selected_idx >= 0 && selected_idx < midiFiles.size()){
|
if (selected_idx >= 0 && selected_idx < midiFiles.size()){
|
||||||
|
|
@ -661,6 +995,7 @@ void ObxdAudioProcessorEditor::updatePresetBar(bool resize){
|
||||||
}
|
}
|
||||||
presetBar->update();
|
presetBar->update();
|
||||||
|
|
||||||
|
presetBar->setBounds((getWidth() - presetBar->getWidth()) / 2, getHeight() -40, presetBar->getWidth(), presetBar->getHeight());
|
||||||
}
|
}
|
||||||
|
|
||||||
void ObxdAudioProcessorEditor::MenuActionCallback(int action){
|
void ObxdAudioProcessorEditor::MenuActionCallback(int action){
|
||||||
|
|
@ -925,9 +1260,38 @@ void ObxdAudioProcessorEditor::mouseUp (const MouseEvent& e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void ObxdAudioProcessorEditor::handleAsyncUpdate() {
|
||||||
|
scaleFactorChanged();
|
||||||
|
repaint();
|
||||||
|
}
|
||||||
|
|
||||||
void ObxdAudioProcessorEditor::paint(Graphics& g)
|
void ObxdAudioProcessorEditor::paint(Graphics& g)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
const float newPhysicalPixelScaleFactor =
|
||||||
|
g.getInternalContext().getPhysicalPixelScaleFactor();
|
||||||
|
|
||||||
|
if (newPhysicalPixelScaleFactor != processor.physicalPixelScaleFactor)
|
||||||
|
{
|
||||||
|
processor.physicalPixelScaleFactor = newPhysicalPixelScaleFactor;
|
||||||
|
//triggerAsyncUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
g.fillAll (Colours::black);
|
g.fillAll (Colours::black);
|
||||||
|
|
||||||
|
// background gui
|
||||||
|
if(processor.showPresetBar){
|
||||||
|
g.drawImage(backgroundImage,
|
||||||
|
0, 0, getWidth(), getHeight() - 40,
|
||||||
|
0, 0, backgroundImage.getWidth(), backgroundImage.getHeight());
|
||||||
|
} else {
|
||||||
|
g.drawImage(backgroundImage,
|
||||||
|
0, 0, getWidth(), getHeight(),
|
||||||
|
0, 0, backgroundImage.getWidth(), backgroundImage.getHeight());
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
#if JUCE_WINDOWS || JUCE_LINUX
|
#if JUCE_WINDOWS || JUCE_LINUX
|
||||||
const File mainFile(skinFolder.getChildFile("main.png"));
|
const File mainFile(skinFolder.getChildFile("main.png"));
|
||||||
#else
|
#else
|
||||||
|
|
@ -960,6 +1324,7 @@ void ObxdAudioProcessorEditor::paint(Graphics& g)
|
||||||
0, 0, image.getWidth(), image.getHeight(),
|
0, 0, image.getWidth(), image.getHeight(),
|
||||||
0, 0, image.getWidth(), image.getHeight());
|
0, 0, image.getWidth(), image.getHeight());
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
#include "Gui/ButtonList.h"
|
#include "Gui/ButtonList.h"
|
||||||
#include "Components/SetPresetNameWindow.h"
|
#include "Components/SetPresetNameWindow.h"
|
||||||
#include "Components/PresetBar.h"
|
#include "Components/PresetBar.h"
|
||||||
|
#include "Components/ScaleComponent.h"
|
||||||
enum KeyPressCommandIDs
|
enum KeyPressCommandIDs
|
||||||
{
|
{
|
||||||
buttonNextProgram = 1,
|
buttonNextProgram = 1,
|
||||||
|
|
@ -49,6 +50,7 @@ enum MenuAction
|
||||||
*/
|
*/
|
||||||
class ObxdAudioProcessorEditor : public AudioProcessorEditor
|
class ObxdAudioProcessorEditor : public AudioProcessorEditor
|
||||||
// , public AudioProcessorListener
|
// , public AudioProcessorListener
|
||||||
|
, public AsyncUpdater
|
||||||
, public ChangeListener
|
, public ChangeListener
|
||||||
// , public Slider::Listener
|
// , public Slider::Listener
|
||||||
, public Button::Listener
|
, public Button::Listener
|
||||||
|
|
@ -56,6 +58,7 @@ class ObxdAudioProcessorEditor : public AudioProcessorEditor
|
||||||
, public ApplicationCommandTarget
|
, public ApplicationCommandTarget
|
||||||
, public Timer
|
, public Timer
|
||||||
, public FileDragAndDropTarget
|
, public FileDragAndDropTarget
|
||||||
|
, public ScalableComponent
|
||||||
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
@ -65,10 +68,13 @@ public:
|
||||||
bool isInterestedInFileDrag(const StringArray& files) override;
|
bool isInterestedInFileDrag(const StringArray& files) override;
|
||||||
void filesDropped(const StringArray& files, int x, int y) override;
|
void filesDropped(const StringArray& files, int x, int y) override;
|
||||||
|
|
||||||
|
void scaleFactorChanged() override;
|
||||||
|
|
||||||
void mouseUp (const MouseEvent& e) override;
|
void mouseUp (const MouseEvent& e) override;
|
||||||
void paint (Graphics& g) override;
|
void paint (Graphics& g) override;
|
||||||
|
|
||||||
void updateFromHost();
|
void updateFromHost();
|
||||||
|
void handleAsyncUpdate() override;
|
||||||
String getCurrentProgramName(){
|
String getCurrentProgramName(){
|
||||||
return processor.getProgramName(processor.getCurrentProgram());
|
return processor.getProgramName(processor.getCurrentProgram());
|
||||||
}
|
}
|
||||||
|
|
@ -166,12 +172,18 @@ public:
|
||||||
void deleteBank();
|
void deleteBank();
|
||||||
|
|
||||||
void resized() override;
|
void resized() override;
|
||||||
|
|
||||||
|
bool isHighResolutionDisplay() const
|
||||||
|
{
|
||||||
|
return processor.physicalPixelScaleFactor > 1.0;
|
||||||
|
}
|
||||||
private:
|
private:
|
||||||
|
Rectangle<int> transformBounds(int x, int y, int w, int h);
|
||||||
Knob* addKnob (int x, int y, int d, ObxdAudioProcessor& filter, int parameter, String name, float defval);
|
Knob* addKnob (int x, int y, int d, ObxdAudioProcessor& filter, int parameter, String name, float defval);
|
||||||
void placeLabel (int x, int y, String text);
|
void placeLabel (int x, int y, String text);
|
||||||
TooglableButton* addButton (int x, int y, int w, int h, ObxdAudioProcessor& filter, int parameter, String name);
|
TooglableButton* addButton (int x, int y, int w, int h, ObxdAudioProcessor& filter, int parameter, String name);
|
||||||
ButtonList* addList(int x, int y, int w, int h, ObxdAudioProcessor& filter, int parameter, String name, Image img);
|
ButtonList* addList(int x, int y, int w, int h, ObxdAudioProcessor& filter, int parameter, String name, String nameImg);
|
||||||
void addMenuButton (int x, int y, int d, const Image&);
|
ImageButton* addMenuButton (int x, int y, int d, String nameImg);
|
||||||
void createMenu ();
|
void createMenu ();
|
||||||
void createMidi(int, PopupMenu &);
|
void createMidi(int, PopupMenu &);
|
||||||
void resultFromMenu (const Point<int>);
|
void resultFromMenu (const Point<int>);
|
||||||
|
|
@ -181,8 +193,12 @@ private:
|
||||||
void rebuildComponents (ObxdAudioProcessor&);
|
void rebuildComponents (ObxdAudioProcessor&);
|
||||||
void loadSkin(ObxdAudioProcessor&);
|
void loadSkin(ObxdAudioProcessor&);
|
||||||
//==============================================================================
|
//==============================================================================
|
||||||
|
public:
|
||||||
ObxdAudioProcessor& processor;
|
ObxdAudioProcessor& processor;
|
||||||
|
private:
|
||||||
|
// images
|
||||||
|
Image backgroundImage;
|
||||||
|
std::map<String, Component*> mappingComps;
|
||||||
//==============================================================================
|
//==============================================================================
|
||||||
Knob* cutoffKnob=nullptr,
|
Knob* cutoffKnob=nullptr,
|
||||||
*resonanceKnob=nullptr,
|
*resonanceKnob=nullptr,
|
||||||
|
|
@ -285,6 +301,7 @@ private:
|
||||||
|
|
||||||
Array<String> midiFiles;
|
Array<String> midiFiles;
|
||||||
int menuMidiNum;
|
int menuMidiNum;
|
||||||
|
int menuScaleNum;
|
||||||
int countTimerForLed = 0;
|
int countTimerForLed = 0;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -69,8 +69,9 @@ ObxdAudioProcessor::ObxdAudioProcessor()
|
||||||
options.storageFormat = PropertiesFile::storeAsXML;
|
options.storageFormat = PropertiesFile::storeAsXML;
|
||||||
options.millisecondsBeforeSaving = 2500;
|
options.millisecondsBeforeSaving = 2500;
|
||||||
options.processLock = &configLock;
|
options.processLock = &configLock;
|
||||||
config = std::unique_ptr<PropertiesFile> (new PropertiesFile (getDocumentFolder().getChildFile ("Skin.xml"), options));
|
config = std::unique_ptr<PropertiesFile> (new PropertiesFile (getDocumentFolder().getChildFile ("Skin.xml"), options));
|
||||||
showPresetBar = config->getBoolValue("presetnavigation");
|
showPresetBar = config->getBoolValue("presetnavigation");
|
||||||
|
gui_size = config->getIntValue("gui_size", 1);
|
||||||
currentSkin = config->containsKey("skin") ? config->getValue("skin") : "Ilkka Rosma Dark";
|
currentSkin = config->containsKey("skin") ? config->getValue("skin") : "Ilkka Rosma Dark";
|
||||||
currentBank = "000 - FMR OB-Xa Patch Book";
|
currentBank = "000 - FMR OB-Xa Patch Book";
|
||||||
|
|
||||||
|
|
@ -408,6 +409,8 @@ void ObxdAudioProcessor::setStateInformation(const void* data, int sizeInBytes)
|
||||||
#else
|
#else
|
||||||
std::unique_ptr<XmlElement> xmlState = getXmlFromBinary(data, sizeInBytes);
|
std::unique_ptr<XmlElement> xmlState = getXmlFromBinary(data, sizeInBytes);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
DBG(" XML:" << xmlState->toString());
|
||||||
if (xmlState)
|
if (xmlState)
|
||||||
{
|
{
|
||||||
XmlElement* xprogs = xmlState->getFirstChildElement();
|
XmlElement* xprogs = xmlState->getFirstChildElement();
|
||||||
|
|
@ -802,6 +805,7 @@ File ObxdAudioProcessor::getPresetsFolder() const
|
||||||
|
|
||||||
File ObxdAudioProcessor::getCurrentSkinFolder() const
|
File ObxdAudioProcessor::getCurrentSkinFolder() const
|
||||||
{
|
{
|
||||||
|
DBG(" SKIN : " << currentSkin);
|
||||||
return getSkinFolder().getChildFile(currentSkin);
|
return getSkinFolder().getChildFile(currentSkin);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -813,6 +817,11 @@ void ObxdAudioProcessor::setCurrentSkinFolder(const String& folderName)
|
||||||
config->setNeedsToBeSaved(true);
|
config->setNeedsToBeSaved(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ObxdAudioProcessor::setGuiSize(const int gui_size) {
|
||||||
|
this->gui_size = gui_size;
|
||||||
|
config->setValue("gui_size", gui_size);
|
||||||
|
config->setNeedsToBeSaved(true);
|
||||||
|
}
|
||||||
//==============================================================================
|
//==============================================================================
|
||||||
String ObxdAudioProcessor::getEngineParameterId (size_t index)
|
String ObxdAudioProcessor::getEngineParameterId (size_t index)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -195,7 +195,7 @@ public:
|
||||||
|
|
||||||
File getCurrentSkinFolder() const;
|
File getCurrentSkinFolder() const;
|
||||||
void setCurrentSkinFolder(const String& folderName);
|
void setCurrentSkinFolder(const String& folderName);
|
||||||
|
void setGuiSize(const int gui_size);
|
||||||
//==============================================================================
|
//==============================================================================
|
||||||
static String getEngineParameterId (size_t);
|
static String getEngineParameterId (size_t);
|
||||||
int getParameterIndexFromId (String);
|
int getParameterIndexFromId (String);
|
||||||
|
|
@ -229,8 +229,11 @@ private:
|
||||||
SynthEngine synth;
|
SynthEngine synth;
|
||||||
ObxdBank programs;
|
ObxdBank programs;
|
||||||
|
|
||||||
String currentSkin;
|
|
||||||
public:
|
public:
|
||||||
|
float physicalPixelScaleFactor;
|
||||||
|
int gui_size;
|
||||||
|
String currentSkin;
|
||||||
String currentBank;
|
String currentBank;
|
||||||
File currentBankFile;
|
File currentBankFile;
|
||||||
void saveBank();
|
void saveBank();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue