Gordonjcp
/
peacock
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Gordonjcp:2d53d3c5da7ed385f6dbb6f0c6d311eef4aed567
Branches Tags
Gordonjcp:master
Gordonjcp:controllers
Gordonjcp:calibration
Gordonjcp:gui
Gordonjcp:tidyup
Gordonjcp:parameters
Gordonjcp:chorusboard
Gordonjcp:voices
Gordonjcp:modelb
..
compare: Gordonjcp:13ff93a0a50132274f97fb2ecd3c69c83affbc4f
Branches Tags
Gordonjcp:controllers
Gordonjcp:master
Gordonjcp:calibration
Gordonjcp:gui
Gordonjcp:tidyup
Gordonjcp:parameters
Gordonjcp:chorusboard
Gordonjcp:voices
Gordonjcp:modelb

No commits in common. "2d53d3c5da7ed385f6dbb6f0c6d311eef4aed567" and "13ff93a0a50132274f97fb2ecd3c69c83affbc4f" have entirely different histories.
2d53d3c5da ... 13ff93a0a5

3 changed files with 35 additions and 55 deletions
Show Stats Expand all files Collapse all files

2
plugin/DistrhoPluginInfo.h
View File

@ -63,7 +63,7 @@
pSustain,
pRelease,
pChorusMode,
pChorus,
parameterCount
};

80
plugin/parameters.cpp
View File

@ -23,7 +23,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pLFORate:
parameter.hints = kParameterIsAutomatable;
parameter.name = "LFO Rate";
parameter.symbol = "pfau_lforate";
parameter.symbol = "ch_lforate";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 48.0f;
@ -33,7 +33,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pLFODelay:
parameter.hints = kParameterIsAutomatable;
parameter.name = "LFO Delay";
parameter.symbol = "pfau_lfodelay";
parameter.symbol = "ch_lfodelay";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 0.0f;
@ -43,7 +43,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pVCORange:
parameter.hints = kParameterIsAutomatable | kParameterIsInteger;
parameter.name = "Range";
parameter.symbol = "pfau_vcorange";
parameter.symbol = "ch_vcorange";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 2.0f;
parameter.ranges.def = 1.0f;
@ -66,7 +66,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pLFODepth:
parameter.hints = kParameterIsAutomatable;
parameter.name = "LFO";
parameter.symbol = "pfau_lfo";
parameter.symbol = "ch_lfo";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 10.0f;
@ -76,7 +76,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pPWMDepth:
parameter.hints = kParameterIsAutomatable;
parameter.name = "PWM";
parameter.symbol = "pfau_pwm";
parameter.symbol = "ch_pwm";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 48.0f;
@ -86,7 +86,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pPWMMode:
parameter.hints = kParameterIsAutomatable | kParameterIsBoolean;
parameter.name = "PWM Mode";
parameter.symbol = "pfau_pwmmode";
parameter.symbol = "ch_pwmmode";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 1.0f;
parameter.ranges.def = 1.0f;
@ -107,7 +107,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pSaw:
parameter.hints = kParameterIsAutomatable | kParameterIsBoolean;
parameter.name = "Saw";
parameter.symbol = "pfau_saw";
parameter.symbol = "ch_saw";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 1.0f;
parameter.ranges.def = 1.0f;
@ -117,7 +117,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pSqr:
parameter.hints = kParameterIsAutomatable | kParameterIsBoolean;
parameter.name = "Square";
parameter.symbol = "pfau_sqr";
parameter.symbol = "ch_sqr";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 1.0f;
parameter.ranges.def = 1.0f;
@ -127,7 +127,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pSubLevel:
parameter.hints = kParameterIsAutomatable;
parameter.name = "Sub Osc";
parameter.symbol = "pfau_sub";
parameter.symbol = "ch_sub";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 0.0f;
@ -137,7 +137,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pNoiseLevel:
parameter.hints = kParameterIsAutomatable;
parameter.name = "Noise";
parameter.symbol = "pfau_noise";
parameter.symbol = "ch_noise";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 0.0f;
@ -147,7 +147,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pHPF:
parameter.hints = kParameterIsAutomatable | kParameterIsInteger;
parameter.name = "HPF";
parameter.symbol = "pfau_hpf";
parameter.symbol = "ch_hpf";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 3.9f;
parameter.ranges.def = 0.0f;
@ -157,7 +157,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pCutoff:
parameter.hints = kParameterIsAutomatable;
parameter.name = "Freq";
parameter.symbol = "pfau_freq";
parameter.symbol = "ch_freq";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 60.0f;
@ -166,7 +166,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pRes:
parameter.hints = kParameterIsAutomatable;
parameter.name = "Res";
parameter.symbol = "pfau_reso";
parameter.symbol = "ch_reso";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 0.0f;
@ -175,7 +175,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pVCFPol:
parameter.hints = kParameterIsAutomatable | kParameterIsInteger;
parameter.name = "Polarity";
parameter.symbol = "pfau_vcfmode";
parameter.symbol = "ch_vcfmode";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 1.0f;
parameter.ranges.def = 0.0f;
@ -195,7 +195,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pEnv:
parameter.hints = kParameterIsAutomatable;
parameter.name = "Env";
parameter.symbol = "pfau_vcfenv";
parameter.symbol = "ch_vcfenv";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 46.0f;
@ -204,7 +204,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pLfo:
parameter.hints = kParameterIsAutomatable;
parameter.name = "LFO";
parameter.symbol = "pfau_vcflfo";
parameter.symbol = "ch_vcflfo";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 0.0f;
@ -213,7 +213,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pKyb:
parameter.hints = kParameterIsAutomatable;
parameter.name = "Kybd";
parameter.symbol = "pfau_vcfkey";
parameter.symbol = "ch_vcfkey";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 71.0f;
@ -223,7 +223,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pAttack:
parameter.hints = kParameterIsAutomatable;
parameter.name = "Attack";
parameter.symbol = "pfau_attack";
parameter.symbol = "ch_attack";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 27.0f;
@ -233,7 +233,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pDecay:
parameter.hints = kParameterIsAutomatable;
parameter.name = "Decay";
parameter.symbol = "pfau_decay";
parameter.symbol = "ch_decay";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 57.0f;
@ -243,7 +243,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pSustain:
parameter.hints = kParameterIsAutomatable;
parameter.name = "Sustain";
parameter.symbol = "pfau_sustain";
parameter.symbol = "ch_sustain";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 57.0f;
@ -253,7 +253,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pRelease:
parameter.hints = kParameterIsAutomatable;
parameter.name = "Release";
parameter.symbol = "pfau_release";
parameter.symbol = "ch_release";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 48.0f;
@ -263,7 +263,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pEnvGate:
parameter.hints = kParameterIsAutomatable | kParameterIsInteger; // | kParameterIsBoolean;
parameter.name = "Env-Gate";
parameter.symbol = "pfau_envgate";
parameter.symbol = "ch_envgate";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 1.0f;
parameter.ranges.def = 0.0f;
@ -283,39 +283,17 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pVCALevel:
parameter.hints = kParameterIsAutomatable;
parameter.name = "VCA Level";
parameter.symbol = "pfau_vcalevel";
parameter.symbol = "ch_vcalevel";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 40.0f;
parameter.midiCC = 26;
break;
case pChorusMode:
parameter.hints = kParameterIsAutomatable | kParameterIsInteger;
parameter.name = "Chorus";
parameter.symbol = "pfau_chorus";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 2.0f;
parameter.ranges.def = 0.0f;
parameter.midiCC = 93;
parameter.enumValues.count = 3;
parameter.enumValues.restrictedMode = true;
{
ParameterEnumerationValue* const enumValues = new ParameterEnumerationValue[3];
enumValues[0].value = 0.0f;
enumValues[0].label = "Off";
enumValues[1].value = 1.0f;
enumValues[1].label = "Slow";
enumValues[2].value = 2.0f;
enumValues[2].label = "Fast";
parameter.enumValues.values = enumValues;
}
/*
case pModWheel:
parameter.hints = kParameterIsAutomatable | kParameterIsHidden;
parameter.name = "Mod wheel";
parameter.symbol = "pfau_modwheel";
parameter.symbol = "ch_modwheel";
parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f;
parameter.ranges.def = 0.0f;
@ -401,9 +379,9 @@ void Peacock::setParameterValue(uint32_t index, float value) {
m->patchRam.switch1 |= (value >= 0.5) << 4;
break;
case pChorusMode:
case pChorus:
m->patchRam.switch1 &= 0x9f;
switch ((int)value) {
case 0:
m->patchRam.switch1 |= 0x60; // both off
@ -528,8 +506,8 @@ float Peacock::getParameterValue(uint32_t index) const {
case pVCALevel:
return m->patchRam.vca;
break;
case pChorusMode:
case pChorus:
switch (m->patchRam.switch1 & 0x60) {
case 0x60:
return 0;
@ -540,6 +518,8 @@ float Peacock::getParameterValue(uint32_t index) const {
default:
break;
}
}
return 0;
}

8
plugin/ui.cpp
View File

@ -268,7 +268,7 @@ void DistrhoUIPeacock::parameterChanged(uint32_t index, float value) {
sw1 |= (value > 0.5) << 4;
break;
case pChorusMode:
case pChorus:
sw1 &= 0x9f;
// 60, 40, 00
switch ((int)value) {
@ -325,15 +325,15 @@ void DistrhoUIPeacock::imageButtonClicked(ImageButton* imgBtn, int) {
break;
case btnCh0:
sw1 = (sw1 & 0x9f) | 0x20;
setParameterValue(pChorusMode, 0);
setParameterValue(pChorus, 0);
break;
case btnCh1:
sw1 = (sw1 & 0x9f) | 0x40;
setParameterValue(pChorusMode, 1);
setParameterValue(pChorus, 1);
break;
case btnCh2:
sw1 = (sw1 & 0x9f);
setParameterValue(pChorusMode, 2);
setParameterValue(pChorus, 2);
break;
default: