Implemented knob value bubble display
This commit is contained in:
parent
3417d52d83
commit
67115a1bf6
3 changed files with 140 additions and 8 deletions
|
@ -25,6 +25,24 @@
|
||||||
#include "../Source/Engine/SynthEngine.h"
|
#include "../Source/Engine/SynthEngine.h"
|
||||||
#include "../Components/ScaleComponent.h"
|
#include "../Components/ScaleComponent.h"
|
||||||
class ObxdAudioProcessor;
|
class ObxdAudioProcessor;
|
||||||
|
|
||||||
|
class KnobLookAndFeel : public LookAndFeel_V4
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
KnobLookAndFeel()
|
||||||
|
{
|
||||||
|
setColour(BubbleComponent::ColourIds::backgroundColourId, Colours::white.withAlpha(0.8f));
|
||||||
|
setColour(BubbleComponent::ColourIds::outlineColourId, Colours::transparentBlack);
|
||||||
|
setColour(TooltipWindow::textColourId, Colours::black);
|
||||||
|
}
|
||||||
|
int getSliderPopupPlacement(Slider&) override
|
||||||
|
{
|
||||||
|
return BubbleComponent::BubblePlacement::above;
|
||||||
|
}
|
||||||
|
private:
|
||||||
|
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(KnobLookAndFeel)
|
||||||
|
};
|
||||||
|
|
||||||
class Knob : public Slider, public ScalableComponent, public ActionBroadcaster
|
class Knob : public Slider, public ScalableComponent, public ActionBroadcaster
|
||||||
{
|
{
|
||||||
juce::String img_name;
|
juce::String img_name;
|
||||||
|
@ -43,8 +61,15 @@ public:
|
||||||
h2 = fh;
|
h2 = fh;
|
||||||
w2 = kni.getWidth();
|
w2 = kni.getWidth();
|
||||||
numFr = kni.getHeight() / h2;
|
numFr = kni.getHeight() / h2;
|
||||||
|
setPopupDisplayEnabled(true, true, getParentComponent());
|
||||||
|
setLookAndFeel(&lookAndFeel);
|
||||||
|
}
|
||||||
|
|
||||||
|
~Knob() override
|
||||||
|
{
|
||||||
|
setLookAndFeel(nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
};
|
|
||||||
void scaleFactorChanged() override
|
void scaleFactorChanged() override
|
||||||
{
|
{
|
||||||
kni = getScaledImageFromCache(img_name, getScaleFactor(), getIsHighResolutionDisplay());
|
kni = getScaledImageFromCache(img_name, getScaleFactor(), getIsHighResolutionDisplay());
|
||||||
|
@ -117,8 +142,6 @@ public:
|
||||||
g.drawImage (kni, 0, 0, getWidth(), getHeight(), 0, h2 * ofs * getScaleInt(), w2 * getScaleInt(), h2 * getScaleInt());
|
g.drawImage (kni, 0, 0, getWidth(), getHeight(), 0, h2 * ofs * getScaleInt(), w2 * getScaleInt(), h2 * getScaleInt());
|
||||||
}
|
}
|
||||||
|
|
||||||
~Knob() override {};
|
|
||||||
|
|
||||||
void resetOnShiftClick(bool value, const String& identifier)
|
void resetOnShiftClick(bool value, const String& identifier)
|
||||||
{
|
{
|
||||||
shouldResetOnShiftClick = value;
|
shouldResetOnShiftClick = value;
|
||||||
|
@ -131,4 +154,5 @@ private:
|
||||||
bool shouldResetOnShiftClick{ false };
|
bool shouldResetOnShiftClick{ false };
|
||||||
String resetActionMessage{};
|
String resetActionMessage{};
|
||||||
AudioProcessorParameter* parameter {nullptr};
|
AudioProcessorParameter* parameter {nullptr};
|
||||||
|
KnobLookAndFeel lookAndFeel;
|
||||||
};
|
};
|
||||||
|
|
|
@ -39,10 +39,12 @@ AudioProcessorValueTreeState::ParameterLayout createParameterLayout()
|
||||||
auto name = TRANS (id);
|
auto name = TRANS (id);
|
||||||
auto range = NormalisableRange<float> {0.0f, 1.0f};
|
auto range = NormalisableRange<float> {0.0f, 1.0f};
|
||||||
auto defaultValue = defaultParams.values[i];
|
auto defaultValue = defaultParams.values[i];
|
||||||
auto parameter = std::make_unique<AudioParameterFloat> (id,
|
auto parameter = std::make_unique<AudioParameterFloat> (
|
||||||
name,
|
id, name, range, defaultValue, String{}, AudioProcessorParameter::genericParameter,
|
||||||
range,
|
[=](float value, int /*maxStringLength*/)
|
||||||
defaultValue);
|
{
|
||||||
|
return ObxdAudioProcessor::getTrueParameterValueFromNormalizedRange(i, value);
|
||||||
|
});
|
||||||
|
|
||||||
params.push_back (std::move (parameter));
|
params.push_back (std::move (parameter));
|
||||||
}
|
}
|
||||||
|
@ -914,6 +916,110 @@ String ObxdAudioProcessor::getEngineParameterId (size_t index)
|
||||||
return "Undefined";
|
return "Undefined";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String ObxdAudioProcessor::getTrueParameterValueFromNormalizedRange(size_t index, float value)
|
||||||
|
{
|
||||||
|
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 String{ logsc(value, 3, 10), 2 } + " Hz";
|
||||||
|
// 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 String{ (roundToInt(value * 4) - 2) * 12.f, 0 } + " Semitones";
|
||||||
|
case TUNE: return String{ value * 200 - 100, 1 } + " Cents";
|
||||||
|
// case BRIGHTNESS: return "Brightness";
|
||||||
|
case NOISEMIX: {
|
||||||
|
const auto decibels = Decibels::gainToDecibels(logsc(value, 0, 1, 35));
|
||||||
|
if (decibels < -80) return "-Inf";
|
||||||
|
return String{ decibels, 2 } + " dB";
|
||||||
|
}
|
||||||
|
case OSC1MIX:
|
||||||
|
case OSC2MIX: {
|
||||||
|
const auto decibels = Decibels::gainToDecibels(value);
|
||||||
|
if (decibels < -80) return "-Inf";
|
||||||
|
return String{ decibels, 2 } + " dB";
|
||||||
|
}
|
||||||
|
// 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 String{ logsc(value, 0, 50, 120), 2 } + " Hz";
|
||||||
|
// case LFOPW1: return "LfoPw1";
|
||||||
|
// case LFOPW2: return "LfoPw2";
|
||||||
|
// case PORTADER: return "PortamentoDetune";
|
||||||
|
// case FILTERDER: return "FilterDetune";
|
||||||
|
// case ENVDER: return "EnvelopeDetune";
|
||||||
|
case PAN1:
|
||||||
|
case PAN2:
|
||||||
|
case PAN3:
|
||||||
|
case PAN4:
|
||||||
|
case PAN5:
|
||||||
|
case PAN6:
|
||||||
|
case PAN7:
|
||||||
|
case PAN8: {
|
||||||
|
const auto pan = value - 0.5f;
|
||||||
|
if (pan < 0.f) return String{ pan, 2 } + " (Left)";
|
||||||
|
if (pan > 0.f) return String{ pan, 2 } + " (Right)";
|
||||||
|
return String{ pan, 2 } + " (Center)";
|
||||||
|
}
|
||||||
|
// case XMOD: return "Xmod";
|
||||||
|
// case OSC2HS: return "Osc2HardSync";
|
||||||
|
// case OSC1P: return String{ getPitch(value * 48), 2 };
|
||||||
|
// case OSC2P: return String{ getPitch(value * 48), 2 };
|
||||||
|
// 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 String{ Decibels::gainToDecibels(linsc(value, 0, 0.30)), 2 };
|
||||||
|
// 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 String{ logsc(value, 4, 60000, 900) / 1000.f, 2};
|
||||||
|
// case LDEC: return String{ logsc(value, 4, 60000, 900) / 1000.f, 2};
|
||||||
|
// case LSUS: return String{ value, 2};
|
||||||
|
// case LREL: return String{ logsc(value, 8, 60000, 900) / 1000.f, 2};
|
||||||
|
// case FATK: return String{ logsc(value, 1, 60000, 900) / 1000.f, 2};
|
||||||
|
// case FDEC: return String{ logsc(value, 1, 60000, 900) / 1000.f, 2};
|
||||||
|
// case FSUS: return String{ value, 2};
|
||||||
|
// case FREL: return String{ logsc(value, 1, 60000, 900) / 1000.f, 2 };
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return String{ value, 2 };
|
||||||
|
}
|
||||||
|
|
||||||
int ObxdAudioProcessor::getParameterIndexFromId (String paramId)
|
int ObxdAudioProcessor::getParameterIndexFromId (String paramId)
|
||||||
{
|
{
|
||||||
for (size_t i = 0; i < PARAM_COUNT; ++i)
|
for (size_t i = 0; i < PARAM_COUNT; ++i)
|
||||||
|
|
|
@ -198,6 +198,8 @@ public:
|
||||||
void setGuiSize(const int gui_size);
|
void setGuiSize(const int gui_size);
|
||||||
//==============================================================================
|
//==============================================================================
|
||||||
static String getEngineParameterId (size_t);
|
static String getEngineParameterId (size_t);
|
||||||
|
static String getTrueParameterValueFromNormalizedRange(size_t, float normalizedValue);
|
||||||
|
|
||||||
int getParameterIndexFromId (String);
|
int getParameterIndexFromId (String);
|
||||||
void setEngineParameterValue (int, float, bool notifyToHost= false);
|
void setEngineParameterValue (int, float, bool notifyToHost= false);
|
||||||
void parameterChanged (const String&, float) override;
|
void parameterChanged (const String&, float) override;
|
||||||
|
|
Loading…
Reference in a new issue