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

Compare commits

base: Gordonjcp:8fb00c1499192cdf01dce19de1f9b8dbebec4425
Branches Tags
Gordonjcp:master
Gordonjcp:controllers
Gordonjcp:calibration
Gordonjcp:gui
Gordonjcp:tidyup
Gordonjcp:parameters
Gordonjcp:chorusboard
Gordonjcp:voices
Gordonjcp:modelb
..
compare: Gordonjcp:dc89ca6cf78e29637c83385e4cca7a649a538b01
Branches Tags
Gordonjcp:controllers
Gordonjcp:master
Gordonjcp:calibration
Gordonjcp:gui
Gordonjcp:tidyup
Gordonjcp:parameters
Gordonjcp:chorusboard
Gordonjcp:voices
Gordonjcp:modelb

No commits in common. "8fb00c1499192cdf01dce19de1f9b8dbebec4425" and "dc89ca6cf78e29637c83385e4cca7a649a538b01" have entirely different histories.
8fb00c1499 ... dc89ca6cf7

7 changed files with 71 additions and 205 deletions
Show Stats Expand all files Collapse all files

2
plugin/DistrhoPluginInfo.h
View File

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

6
plugin/chorus.cpp
View File

@ -21,7 +21,6 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include <stdio.h>
Chorus::Chorus() { Chorus::Chorus() {
lpfOut1 = new float[bufferSize]; lpfOut1 = new float[bufferSize];
lpfOut2 = new float[bufferSize]; lpfOut2 = new float[bufferSize];
@ -103,7 +102,6 @@ void Chorus::run(float* input, float** outputs, uint32_t frames) {
delayptr++; delayptr++;
delayptr &= 0x3ff; delayptr &= 0x3ff;
} }
//printf("dly1 = %f\n", dly1);
postFilter1l->runSVF(lpfOut1, lpfOut1, frames); postFilter1l->runSVF(lpfOut1, lpfOut1, frames);
postFilter2l->runSVF(lpfOut1, lpfOut1, frames); postFilter2l->runSVF(lpfOut1, lpfOut1, frames);
@ -154,11 +152,11 @@ void Chorus::setChorus(uint8_t mode) {
break; break;
case 0x40: case 0x40:
gain = 1.2; gain = 1.2;
lfoSpeed = 6.283 * 0.3 / sampleRate; lfoSpeed = 6.283 * 0.5 / sampleRate;
break; break;
case 0x00: case 0x00:
gain = 1.2; gain = 1.2;
lfoSpeed = 6.283 * 0.5 / sampleRate; lfoSpeed = 6.283 * 0.9 / sampleRate;
break; break;
} }
} }

2
plugin/module.cpp
View File

@ -74,7 +74,7 @@ void Module::run(Voice* voices, uint32_t blockSize) {
sub = patchRam.sub / 127.0f; sub = patchRam.sub / 127.0f;
lfoPhase += lfoRateTable[patchRam.lfoRate]; lfoPhase += lfoRateTable[patchRam.lfoRate];
res = patchRam.vcfReso / 127.0; res = patchRam.vcfReso / 127.0 * 5;
noise = patchRam.noise / 127.0; noise = patchRam.noise / 127.0;
// FIXME the exp in these is expensive, don't call it all the time // FIXME the exp in these is expensive, don't call it all the time

76
plugin/module.hpp
View File

@ -48,74 +48,26 @@ class Module {
float saw = 0, square = 0, sub = 0, noise = 0; float saw = 0, square = 0, sub = 0, noise = 0;
/*
#if 0
struct {
uint8_t lfoRate = 0x58;
uint8_t lfoDelay = 0x00;
uint8_t vcoLfo = 0x00;
uint8_t pwmLfo = 0x3b;
uint8_t noise = 0x00;
uint8_t vcfFreq = 0x25; // 1c; // 0x3f80
uint8_t vcfReso = 0x6a;
uint8_t vcfEnv = 0x25; // 4e;
uint8_t vcfLfo = 0x00;
uint8_t vcfKey = 0x00; // 47;
uint8_t vca = 0x35;
uint8_t env_a = 0x00;
uint8_t env_d = 0x3c;
uint8_t env_s = 0x00; // 0x3f80
uint8_t env_r = 0x3c;
uint8_t sub = 0x7f;
uint8_t switch1 = 0x4a;
uint8_t switch2 = 0x18;
} patchRam;
#else
struct {
uint8_t lfoRate = 0x40;
uint8_t lfoDelay = 0x00;
uint8_t vcoLfo = 0x00;
uint8_t pwmLfo = 0x00;
uint8_t noise = 0x01;
uint8_t vcfFreq = 0x31;
uint8_t vcfReso = 0x7f;
uint8_t vcfEnv = 0x00;
uint8_t vcfLfo = 0x00;
uint8_t vcfKey = 0x7f;
uint8_t vca = 0x40;
uint8_t env_a = 0x00;
uint8_t env_d = 0x00;
uint8_t env_s = 0x00; // 0x3f80
uint8_t env_r = 0x00;
uint8_t sub = 0x00;
uint8_t switch1 = 0x22;
uint8_t switch2 = 0x1d;
} patchRam;
#endif
*/
struct { struct {
uint8_t lfoRate = 0x00; uint8_t lfoRate = 0x58;
uint8_t lfoDelay = 0x00; uint8_t lfoDelay = 0x00;
uint8_t vcoLfo = 0x00; uint8_t vcoLfo = 0x00;
uint8_t pwmLfo = 0x3c; uint8_t pwmLfo = 0x3b;
uint8_t noise = 0x00; uint8_t noise = 0x00;
uint8_t vcfFreq = 0x25; // 1c; // 0x3f80 uint8_t vcfFreq = 0x25; // 1c; // 0x3f80
uint8_t vcfReso = 0x1d; uint8_t vcfReso = 0x6a;
uint8_t vcfEnv = 0x1c; // 4e; uint8_t vcfEnv = 0x25; // 4e;
uint8_t vcfLfo = 0x00; uint8_t vcfLfo = 0x00;
uint8_t vcfKey = 0x2b; // 47; uint8_t vcfKey = 0x00; // 47;
uint8_t vca = 0x5c; uint8_t vca = 0x35;
uint8_t env_a = 0x00; uint8_t env_a = 0x00;
uint8_t env_d = 0x2a; uint8_t env_d = 0x3c;
uint8_t env_s = 0x23; // 0x3f80 uint8_t env_s = 0x00; // 0x3f80
uint8_t env_r = 0x00; uint8_t env_r = 0x3c;
uint8_t sub = 0x40; uint8_t sub = 0x7f;
uint8_t switch1 = 0x19; uint8_t switch1 = 0x4a;
uint8_t switch2 = 0x18; uint8_t switch2 = 0x18;
} patchRam; } patchRam;
Chorus* chorus; Chorus* chorus;
float vcaTC; float vcaTC;
@ -152,16 +104,14 @@ class Voice {
uint8_t envPhase = 0; uint8_t envPhase = 0;
int16_t env = 0; // output amplitude int16_t env = 0; // output amplitude
uint16_t vcfCut; int16_t vcfCut;
int16_t vcaEnv; int16_t vcaEnv;
float vcaRC = 0, vcfRC = 0; float vcaRC = 0, vcfRC = 0;
uint8_t note = 0; uint8_t note = 0;
// filter // filter
float y0 = 0, y1 = 0, y2 = 0, y3 = 0; float b1 = 0, b2 = 0, b3 = 0, b4 = 0;
double s[4] = {0, 0, 0, 0};
float zi = 0;
}; };
#endif #endif

62
plugin/parameters.cpp
View File

@ -23,7 +23,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pLFORate: case pLFORate:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "LFO Rate"; parameter.name = "LFO Rate";
parameter.symbol = "pfau_lforate"; parameter.symbol = "ch_lforate";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 48.0f; parameter.ranges.def = 48.0f;
@ -33,7 +33,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pLFODelay: case pLFODelay:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "LFO Delay"; parameter.name = "LFO Delay";
parameter.symbol = "pfau_lfodelay"; parameter.symbol = "ch_lfodelay";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 0.0f; parameter.ranges.def = 0.0f;
@ -43,7 +43,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pVCORange: case pVCORange:
parameter.hints = kParameterIsAutomatable | kParameterIsInteger; parameter.hints = kParameterIsAutomatable | kParameterIsInteger;
parameter.name = "Range"; parameter.name = "Range";
parameter.symbol = "pfau_vcorange"; parameter.symbol = "ch_vcorange";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 2.0f; parameter.ranges.max = 2.0f;
parameter.ranges.def = 1.0f; parameter.ranges.def = 1.0f;
@ -65,7 +65,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pLFODepth: case pLFODepth:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "LFO"; parameter.name = "LFO";
parameter.symbol = "pfau_lfo"; parameter.symbol = "ch_lfo";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 10.0f; parameter.ranges.def = 10.0f;
@ -75,7 +75,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pPWMDepth: case pPWMDepth:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "PWM"; parameter.name = "PWM";
parameter.symbol = "pfau_pwm"; parameter.symbol = "ch_pwm";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 48.0f; parameter.ranges.def = 48.0f;
@ -85,7 +85,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pPWMMode: case pPWMMode:
parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.hints = kParameterIsAutomatable | kParameterIsBoolean;
parameter.name = "PWM Mode"; parameter.name = "PWM Mode";
parameter.symbol = "pfau_pwmmode"; parameter.symbol = "ch_pwmmode";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 1.0f; parameter.ranges.max = 1.0f;
parameter.ranges.def = 1.0f; parameter.ranges.def = 1.0f;
@ -106,7 +106,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pSaw: case pSaw:
parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.hints = kParameterIsAutomatable | kParameterIsBoolean;
parameter.name = "Saw"; parameter.name = "Saw";
parameter.symbol = "pfau_saw"; parameter.symbol = "ch_saw";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 1.0f; parameter.ranges.max = 1.0f;
parameter.ranges.def = 1.0f; parameter.ranges.def = 1.0f;
@ -116,7 +116,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pSqr: case pSqr:
parameter.hints = kParameterIsAutomatable | kParameterIsBoolean; parameter.hints = kParameterIsAutomatable | kParameterIsBoolean;
parameter.name = "Square"; parameter.name = "Square";
parameter.symbol = "pfau_sqr"; parameter.symbol = "ch_sqr";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 1.0f; parameter.ranges.max = 1.0f;
parameter.ranges.def = 1.0f; parameter.ranges.def = 1.0f;
@ -126,7 +126,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pSubLevel: case pSubLevel:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "Sub Osc"; parameter.name = "Sub Osc";
parameter.symbol = "pfau_sub"; parameter.symbol = "ch_sub";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 0.0f; parameter.ranges.def = 0.0f;
@ -136,7 +136,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pNoiseLevel: case pNoiseLevel:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "Noise"; parameter.name = "Noise";
parameter.symbol = "pfau_noise"; parameter.symbol = "ch_noise";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 0.0f; parameter.ranges.def = 0.0f;
@ -146,7 +146,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pHPF: case pHPF:
parameter.hints = kParameterIsAutomatable | kParameterIsInteger; parameter.hints = kParameterIsAutomatable | kParameterIsInteger;
parameter.name = "HPF"; parameter.name = "HPF";
parameter.symbol = "pfau_hpf"; parameter.symbol = "ch_hpf";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 3.9f; parameter.ranges.max = 3.9f;
parameter.ranges.def = 0.0f; parameter.ranges.def = 0.0f;
@ -156,7 +156,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pCutoff: case pCutoff:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "Freq"; parameter.name = "Freq";
parameter.symbol = "pfau_freq"; parameter.symbol = "ch_freq";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 60.0f; parameter.ranges.def = 60.0f;
@ -165,7 +165,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pRes: case pRes:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "Res"; parameter.name = "Res";
parameter.symbol = "pfau_reso"; parameter.symbol = "ch_reso";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 0.0f; parameter.ranges.def = 0.0f;
@ -174,7 +174,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pVCFPol: case pVCFPol:
parameter.hints = kParameterIsAutomatable | kParameterIsInteger; parameter.hints = kParameterIsAutomatable | kParameterIsInteger;
parameter.name = "Polarity"; parameter.name = "Polarity";
parameter.symbol = "pfau_vcfmode"; parameter.symbol = "ch_vcfmode";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 1.0f; parameter.ranges.max = 1.0f;
parameter.ranges.def = 0.0f; parameter.ranges.def = 0.0f;
@ -194,7 +194,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pEnv: case pEnv:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "Env"; parameter.name = "Env";
parameter.symbol = "pfau_vcfenv"; parameter.symbol = "ch_vcfenv";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 46.0f; parameter.ranges.def = 46.0f;
@ -203,7 +203,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pLfo: case pLfo:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "LFO"; parameter.name = "LFO";
parameter.symbol = "pfau_vcflfo"; parameter.symbol = "ch_vcflfo";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 0.0f; parameter.ranges.def = 0.0f;
@ -212,7 +212,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pKyb: case pKyb:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "Kybd"; parameter.name = "Kybd";
parameter.symbol = "pfau_vcfkey"; parameter.symbol = "ch_vcfkey";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 71.0f; parameter.ranges.def = 71.0f;
@ -222,7 +222,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pAttack: case pAttack:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "Attack"; parameter.name = "Attack";
parameter.symbol = "pfau_attack"; parameter.symbol = "ch_attack";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 27.0f; parameter.ranges.def = 27.0f;
@ -232,7 +232,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pDecay: case pDecay:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "Decay"; parameter.name = "Decay";
parameter.symbol = "pfau_decay"; parameter.symbol = "ch_decay";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 57.0f; parameter.ranges.def = 57.0f;
@ -242,7 +242,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pSustain: case pSustain:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "Sustain"; parameter.name = "Sustain";
parameter.symbol = "pfau_sustain"; parameter.symbol = "ch_sustain";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 57.0f; parameter.ranges.def = 57.0f;
@ -252,7 +252,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pRelease: case pRelease:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "Release"; parameter.name = "Release";
parameter.symbol = "pfau_release"; parameter.symbol = "ch_release";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 48.0f; parameter.ranges.def = 48.0f;
@ -262,7 +262,7 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pEnvGate: case pEnvGate:
parameter.hints = kParameterIsAutomatable | kParameterIsInteger; // | kParameterIsBoolean; parameter.hints = kParameterIsAutomatable | kParameterIsInteger; // | kParameterIsBoolean;
parameter.name = "Env-Gate"; parameter.name = "Env-Gate";
parameter.symbol = "pfau_envgate"; parameter.symbol = "ch_envgate";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 1.0f; parameter.ranges.max = 1.0f;
parameter.ranges.def = 0.0f; parameter.ranges.def = 0.0f;
@ -282,38 +282,39 @@ void Peacock::initParameter(uint32_t index, Parameter& parameter) {
case pVCALevel: case pVCALevel:
parameter.hints = kParameterIsAutomatable; parameter.hints = kParameterIsAutomatable;
parameter.name = "VCA Level"; parameter.name = "VCA Level";
parameter.symbol = "pfau_vcalevel"; parameter.symbol = "ch_vcalevel";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 40.0f; parameter.ranges.def = 40.0f;
parameter.midiCC = 26; parameter.midiCC = 26;
break; break;
case pChorusMode: case pChorus:
parameter.hints = kParameterIsAutomatable | kParameterIsInteger; parameter.hints = kParameterIsAutomatable | kParameterIsInteger;
parameter.name = "Chorus"; parameter.name = "Chorus";
parameter.symbol = "pfau_chorus"; parameter.symbol = "ch_chorus";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 2.0f; parameter.ranges.max = 2.0f;
parameter.ranges.def = 0.0f; parameter.ranges.def = 1.0f;
parameter.midiCC = 93; parameter.midiCC = 93;
parameter.enumValues.count = 3; parameter.enumValues.count = 3;
parameter.enumValues.restrictedMode = true; parameter.enumValues.restrictedMode = true;
{ {
ParameterEnumerationValue* const enumValues = new ParameterEnumerationValue[3]; ParameterEnumerationValue* const enumValues = new ParameterEnumerationValue[3];
enumValues[0].value = 0.0f; enumValues[0].value = 0.0f;
enumValues[0].label = "Off"; enumValues[0].label = "Off'";
enumValues[1].value = 1.0f; enumValues[1].value = 1.0f;
enumValues[1].label = "Slow"; enumValues[1].label = "Slow";
enumValues[2].value = 2.0f; enumValues[2].value = 2.0f;
enumValues[2].label = "Fast"; enumValues[2].label = "Fast";
parameter.enumValues.values = enumValues; parameter.enumValues.values = enumValues;
} }
break;
/* /*
case pModWheel: case pModWheel:
parameter.hints = kParameterIsAutomatable | kParameterIsHidden; parameter.hints = kParameterIsAutomatable | kParameterIsHidden;
parameter.name = "Mod wheel"; parameter.name = "Mod wheel";
parameter.symbol = "pfau_modwheel"; parameter.symbol = "ch_modwheel";
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 127.0f; parameter.ranges.max = 127.0f;
parameter.ranges.def = 0.0f; parameter.ranges.def = 0.0f;
@ -399,7 +400,7 @@ void Peacock::setParameterValue(uint32_t index, float value) {
m->patchRam.switch1 |= (value >= 0.5) << 4; m->patchRam.switch1 |= (value >= 0.5) << 4;
break; break;
case pChorusMode: case pChorus:
m->patchRam.switch1 &= 0x9f; m->patchRam.switch1 &= 0x9f;
switch ((int)value) { switch ((int)value) {
case 0: case 0:
@ -525,7 +526,8 @@ float Peacock::getParameterValue(uint32_t index) const {
case pVCALevel: case pVCALevel:
return m->patchRam.vca; return m->patchRam.vca;
break; break;
case pChorusMode: case pChorus:
switch (m->patchRam.switch1 & 0x60) { switch (m->patchRam.switch1 & 0x60) {
case 0x60: case 0x60:
return 0; return 0;

8
plugin/ui.cpp
View File

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

116
plugin/voice.cpp
View File

@ -41,7 +41,7 @@ Voice::Voice() {
void Voice::on(uint8_t midiNote) { void Voice::on(uint8_t midiNote) {
while (midiNote < 24) midiNote += 12; while (midiNote < 24) midiNote += 12;
while (midiNote > 108) midiNote -= 12; while (midiNote > 108) midiNote -=12;
note = midiNote - 24; note = midiNote - 24;
envPhase = 1; envPhase = 1;
} }
@ -50,26 +50,15 @@ void Voice::off() {
envPhase = 0; envPhase = 0;
} }
// tanh(x)/x approximation, flatline at very high inputs
// so might not be safe for very large feedback gains
// [limit is 1/15 so very large means ~15 or +23dB]
double tanhXdX(double x) {
float s = 0.0333, d = 30.0;
return 1.0f - s * (d + 1.0f) * x * x / (d + x * x);
}
void Voice::run(Module* m, float* buffer, uint32_t samples) { void Voice::run(Module* m, float* buffer, uint32_t samples) {
// carry out per-voice calculations for each block of samples // carry out per-voice calculations for each block of samples
float out, t, fb; float out, t, fb;
// FIXME incorrect
// calculate cutoff frequency // calculate cutoff frequency
float cut = 261.0f * (powf(2, (vcfCut - 0x1880) / 1143.0f)); float cut = 248.0f * (powf(2, (vcfCut - 0x1880) / 1143.0f));
cut = M_PI * cut / sampleRate; cut = 0.25 * 6.2832 * cut / 48000.0f; // FIXME hardcoded values
cut = cut / (1 + cut); // correct tuning warp cut = cut / (1 + cut); // correct tuning warp
// if (cut > 0.7) cut = 0.7;
double r = 5 * m->res;
float amp = vcaEnv / 4096.0f; float amp = vcaEnv / 4096.0f;
@ -106,104 +95,31 @@ void Voice::run(Module* m, float* buffer, uint32_t samples) {
// FIXME DC offset removal // FIXME DC offset removal
delay += m->saw * (1 - (2 * theta)); delay += m->saw * (1 - (2 * theta));
delay += m->square * ((pulseStage ? -1.f : 1.f) - m->pwmBuf[i] + 0.5); delay += m->square * ((pulseStage ? -1.f : 1.f) - m->pwmBuf[i] + 0.5);
delay += m->subBuf[i] * subosc; delay += m->subBuf[i] * subosc ;
out += m->noise * (0.8 - 1.6 * (rand() & 0xffff) / 65536.0); out += m->noise * (0.8 - 1.6 * (rand() & 0xffff) / 65536.0);
// out *= 0.1; out *= 0.5;
// same time constant for both VCF and VCF RC circuits // same time constant for both VCF and VCF RC circuits
vcfRC = (cut - vcfRC) * m->vcaTC + vcfRC; vcfRC = (cut - vcfRC) * m->vcaTC + vcfRC;
#if 1 for (uint8_t ovs = 0; ovs < 4; ovs++) {
fb = b4;
//// LICENSE TERMS: Copyright 2012 Teemu Voipio
//
// You can use this however you like for pretty much any purpose,
// as long as you don't claim you wrote it. There is no warranty.
//
// Distribution of substantial portions of this code in source form
// must include this copyright notice and list of conditions.
//
// input delay and state for member variables
// cutoff as normalized frequency (eg 0.5 = Nyquist)
// resonance from 0 to 1, self-oscillates at settings over 0.9
// void transistorLadder(
// double cutoff, double resonance,
// double * in, double * out, unsigned nsamples)
//{
// tuning and feedback
//------------------------------------------------------------------------------ sample loop
// for(unsigned n = 0; n < nsamples; ++n)
//{
out *= 0.025;
// input with half delay, for non-linearities
double ih = 0.5 * (out + zi);
zi = out;
// double ih = out;
// evaluate the non-linear gains
double t0 = tanhXdX((ih * (r + 1)) - r * s[3]);
double t1 = tanhXdX(s[0]);
double t2 = tanhXdX(s[1]);
double t3 = tanhXdX(s[2]);
double t4 = tanhXdX(s[3]);
double f = vcfRC;
// g# the denominators for solutions of individual stages
double g0 = 1 / (1 + f * t1), g1 = 1 / (1 + f * t2);
double g2 = 1 / (1 + f * t3), g3 = 1 / (1 + f * t4);
// f# are just factored out of the feedback solution
double f3 = f * t3 * g3, f2 = f * t2 * g2 * f3, f1 = f * t1 * g1 * f2, f0 = f * t0 * g0 * f1;
// solve feedback
double y3 = (g3 * s[3] + f3 * g2 * s[2] + f2 * g1 * s[1] + f1 * g0 * s[0] + f0 * out) / (1 + r * f0);
// then solve the remaining outputs (with the non-linear gains here)
double xx = t0 * ((out * (r + 1)) - r * y3);
double y0 = t1 * g0 * (s[0] + f * xx);
double y1 = t2 * g1 * (s[1] + f * y0);
double y2 = t3 * g2 * (s[2] + f * y1);
// update state
s[0] += 2 * f * (xx - y0);
s[1] += 2 * f * (y0 - y1);
s[2] += 2 * f * (y1 - y2);
s[3] += 2 * f * (y2 - t4 * y3);
// out[n] = y3;
// }
// out *= 0.1;
out = y3;
#else
out *= 0.5;
for (uint8_t ovs = 0; ovs < 2; ovs++) {
fb = y3;
// hard clip // hard clip
fb = ((out * 0.5) - fb) * r; fb = ((out * 0.5) - fb) * m->res;
if (fb > 4) fb = 4; if (fb > 4) fb = 4;
if (fb < -4) fb = -4; if (fb < -4) fb = -4;
// fb = 1.5 * fb - 0.5 * fb * fb * fb; // fb = 1.5 * fb - 0.5 * fb * fb * fb;
// //
y0 = ((out + fb - y0) * vcfRC) + y0; b1 = ((out + fb - b1) * vcfRC) + b1;
y1 = ((y0 - y1) * vcfRC) + y1; b2 = ((b1 - b2) * vcfRC) + b2;
y2 = ((y1 - y2) * vcfRC) + y2; b3 = ((b2 - b3) * vcfRC) + b3;
y3 = ((y2 - y3) * vcfRC) + y3; b4 = ((b3 - b4) * vcfRC) + b4;
} }
#endif
vcaRC = (amp - vcaRC) * m->vcaTC + vcaRC; vcaRC = (amp - vcaRC) * m->vcaTC + vcaRC;
buffer[i] += m->vcaBuf[i] * vcaRC * out; buffer[i] += 0.09367 * m->vcaBuf[i] * vcaRC * b4;
lastpw = m->pwmBuf[i]; lastpw = m->pwmBuf[i];
} }