wirtz
/
dexed
mirror of https://github.com/dcoredump/dexed.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'parameter-bugfix' of https://github.com/Sentinel77/dexed into Sentinel77-parameter-bugfix

Browse Source
pull/1/head
asb2m10 9 years ago
parent 0277ffba8c 6f4692aa1e
commit fdf15fda1d
1 changed files with 29 additions and 38 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 67
      Source/PluginParam.cpp

67
Source/PluginParam.cpp
Unescape View File

@ -49,8 +49,6 @@ public:
String getValueDisplay() { String getValueDisplay() {
String ret; String ret;
int value = getValue(); int value = getValue();
if ( value == 48 )
value = 47;
switch(value % 12) { switch(value % 12) {
case 0: ret << "C"; break; case 0: ret << "C"; break;
@ -256,17 +254,11 @@ float CtrlDX::getValueHost() {
} }
void CtrlDX::setValueHost(float f) { void CtrlDX::setValueHost(float f) {
if ( f == 1 ) setValue(roundToInt(f * steps));
f = 0.999;
setValue((f * steps));
} }
void CtrlDX::setValue(int v) { void CtrlDX::setValue(int v) {
TRACE("setting value %d %d", dxOffset, v); TRACE("setting value %d %d", dxOffset, v);
if (v >= steps) {
TRACE("WARNING: value too big %s : %d", label.toRawUTF8(), v);
v = steps - 1;
}
dxValue = v; dxValue = v;
if (dxOffset >= 0) { if (dxOffset >= 0) {
if (parent != NULL) if (parent != NULL)
@ -361,28 +353,28 @@ void DexedAudioProcessor::initCtrl() {
tune = new CtrlTune("MASTER TUNE ADJ", this); tune = new CtrlTune("MASTER TUNE ADJ", this);
ctrl.add(tune); ctrl.add(tune);
algo = new CtrlDX("ALGORITHM", 32, 134, 1); algo = new CtrlDX("ALGORITHM", 31, 134, 1);
ctrl.add(algo); ctrl.add(algo);
feedback = new CtrlDX("FEEDBACK", 8, 135); feedback = new CtrlDX("FEEDBACK", 7, 135);
ctrl.add(feedback); ctrl.add(feedback);
oscSync = new CtrlDX("OSC KEY SYNC", 2, 136); oscSync = new CtrlDX("OSC KEY SYNC", 1, 136);
ctrl.add(oscSync); ctrl.add(oscSync);
lfoRate = new CtrlDX("LFO SPEED", 100, 137); lfoRate = new CtrlDX("LFO SPEED", 99, 137);
ctrl.add(lfoRate); ctrl.add(lfoRate);
lfoDelay = new CtrlDX("LFO DELAY", 100, 138); lfoDelay = new CtrlDX("LFO DELAY", 99, 138);
ctrl.add(lfoDelay); ctrl.add(lfoDelay);
lfoPitchDepth = new CtrlDX("LFO PM DEPTH", 100, 139); lfoPitchDepth = new CtrlDX("LFO PM DEPTH", 99, 139);
ctrl.add(lfoPitchDepth); ctrl.add(lfoPitchDepth);
lfoAmpDepth = new CtrlDX("LFO AM DEPTH", 100, 140); lfoAmpDepth = new CtrlDX("LFO AM DEPTH", 99, 140);
ctrl.add(lfoAmpDepth); ctrl.add(lfoAmpDepth);
lfoSync = new CtrlDX("LFO KEY SYNC", 2, 141); lfoSync = new CtrlDX("LFO KEY SYNC", 1, 141);
ctrl.add(lfoSync); ctrl.add(lfoSync);
StringArray lbl; StringArray lbl;
@ -393,26 +385,26 @@ void DexedAudioProcessor::initCtrl() {
lbl.add("SINE"); lbl.add("SINE");
lbl.add("S&HOLD"); lbl.add("S&HOLD");
lfoWaveform = new CtrlDXLabel("LFO WAVE", 6, 142, lbl); lfoWaveform = new CtrlDXLabel("LFO WAVE", 5, 142, lbl);
ctrl.add(lfoWaveform); ctrl.add(lfoWaveform);
transpose = new CtrlDXTranspose("MIDDLE C", 49, 144); transpose = new CtrlDXTranspose("MIDDLE C", 48, 144);
ctrl.add(transpose); ctrl.add(transpose);
pitchModSens = new CtrlDX("P MODE SENS.", 8, 143); pitchModSens = new CtrlDX("P MODE SENS.", 7, 143);
ctrl.add(pitchModSens); ctrl.add(pitchModSens);
for (int i=0;i<4;i++) { for (int i=0;i<4;i++) {
String rate; String rate;
rate << "PITCH EG RATE " << (i+1); rate << "PITCH EG RATE " << (i+1);
pitchEgRate[i] = new CtrlDX(rate, 100, 126+i); pitchEgRate[i] = new CtrlDX(rate, 99, 126+i);
ctrl.add(pitchEgRate[i]); ctrl.add(pitchEgRate[i]);
} }
for (int i=0;i<4;i++) { for (int i=0;i<4;i++) {
String level; String level;
level << "PITCH EG LEVEL " << (i+1); level << "PITCH EG LEVEL " << (i+1);
pitchEgLevel[i] = new CtrlDX(level, 100, 130+i); pitchEgLevel[i] = new CtrlDX(level, 99, 130+i);
ctrl.add(pitchEgLevel[i]); ctrl.add(pitchEgLevel[i]);
} }
@ -433,80 +425,80 @@ void DexedAudioProcessor::initCtrl() {
for (int j = 0; j < 4; j++) { for (int j = 0; j < 4; j++) {
String opRate; String opRate;
opRate << opName << " EG RATE " << (j + 1); opRate << opName << " EG RATE " << (j + 1);
opCtrl[opVal].egRate[j] = new CtrlDX(opRate, 100, opTarget + j); opCtrl[opVal].egRate[j] = new CtrlDX(opRate, 99, opTarget + j);
ctrl.add(opCtrl[opVal].egRate[j]); ctrl.add(opCtrl[opVal].egRate[j]);
} }
for (int j = 0; j < 4; j++) { for (int j = 0; j < 4; j++) {
String opLevel; String opLevel;
opLevel << opName << " EG LEVEL " << (j + 1); opLevel << opName << " EG LEVEL " << (j + 1);
opCtrl[opVal].egLevel[j] = new CtrlDX(opLevel, 100, opTarget + j + 4); opCtrl[opVal].egLevel[j] = new CtrlDX(opLevel, 99, opTarget + j + 4);
ctrl.add(opCtrl[opVal].egLevel[j]); ctrl.add(opCtrl[opVal].egLevel[j]);
} }
String opVol; String opVol;
opVol << opName << " OUTPUT LEVEL"; opVol << opName << " OUTPUT LEVEL";
opCtrl[opVal].level = new CtrlDX(opVol, 100, opTarget + 16); opCtrl[opVal].level = new CtrlDX(opVol, 99, opTarget + 16);
ctrl.add(opCtrl[opVal].level); ctrl.add(opCtrl[opVal].level);
String opMode; String opMode;
opMode << opName << " MODE"; opMode << opName << " MODE";
opCtrl[opVal].opMode = new CtrlDX(opMode, 2, opTarget + 17); opCtrl[opVal].opMode = new CtrlDX(opMode, 1, opTarget + 17);
ctrl.add(opCtrl[opVal].opMode); ctrl.add(opCtrl[opVal].opMode);
String coarse; String coarse;
coarse << opName << " F COARSE"; coarse << opName << " F COARSE";
opCtrl[opVal].coarse = new CtrlDX(coarse, 32, opTarget + 18); opCtrl[opVal].coarse = new CtrlDX(coarse, 31, opTarget + 18);
ctrl.add(opCtrl[opVal].coarse); ctrl.add(opCtrl[opVal].coarse);
String fine; String fine;
fine << opName << " F FINE"; fine << opName << " F FINE";
opCtrl[opVal].fine = new CtrlDX(fine, 100, opTarget + 19); opCtrl[opVal].fine = new CtrlDX(fine, 99, opTarget + 19);
ctrl.add(opCtrl[opVal].fine); ctrl.add(opCtrl[opVal].fine);
String detune; String detune;
detune << opName << " OSC DETUNE"; detune << opName << " OSC DETUNE";
opCtrl[opVal].detune = new CtrlDX(detune, 15, opTarget + 20, -7); opCtrl[opVal].detune = new CtrlDX(detune, 14, opTarget + 20, -7);
ctrl.add(opCtrl[opVal].detune); ctrl.add(opCtrl[opVal].detune);
String sclBrkPt; String sclBrkPt;
sclBrkPt << opName << " BREAK POINT"; sclBrkPt << opName << " BREAK POINT";
opCtrl[opVal].sclBrkPt = new CtrlDX(sclBrkPt, 100, opTarget + 8); opCtrl[opVal].sclBrkPt = new CtrlDX(sclBrkPt, 99, opTarget + 8);
ctrl.add(opCtrl[opVal].sclBrkPt); ctrl.add(opCtrl[opVal].sclBrkPt);
String sclLeftDepth; String sclLeftDepth;
sclLeftDepth << opName << " L SCALE DEPTH"; sclLeftDepth << opName << " L SCALE DEPTH";
opCtrl[opVal].sclLeftDepth = new CtrlDX(sclLeftDepth, 100, opTarget + 9); opCtrl[opVal].sclLeftDepth = new CtrlDX(sclLeftDepth, 99, opTarget + 9);
ctrl.add(opCtrl[opVal].sclLeftDepth); ctrl.add(opCtrl[opVal].sclLeftDepth);
String sclRightDepth; String sclRightDepth;
sclRightDepth << opName << " R SCALE DEPTH"; sclRightDepth << opName << " R SCALE DEPTH";
opCtrl[opVal].sclRightDepth = new CtrlDX(sclRightDepth, 100, opTarget + 10); opCtrl[opVal].sclRightDepth = new CtrlDX(sclRightDepth, 99, opTarget + 10);
ctrl.add(opCtrl[opVal].sclRightDepth); ctrl.add(opCtrl[opVal].sclRightDepth);
String sclLeftCurve; String sclLeftCurve;
sclLeftCurve << opName << " L KEY SCALE"; sclLeftCurve << opName << " L KEY SCALE";
opCtrl[opVal].sclLeftCurve = new CtrlDXLabel(sclLeftCurve, 4, opTarget + 11, keyScaleLabels); opCtrl[opVal].sclLeftCurve = new CtrlDXLabel(sclLeftCurve, 3, opTarget + 11, keyScaleLabels);
ctrl.add(opCtrl[opVal].sclLeftCurve); ctrl.add(opCtrl[opVal].sclLeftCurve);
String sclRightCurve; String sclRightCurve;
sclRightCurve << opName << " R KEY SCALE"; sclRightCurve << opName << " R KEY SCALE";
opCtrl[opVal].sclRightCurve = new CtrlDXLabel(sclRightCurve, 4, opTarget + 12, keyScaleLabels); opCtrl[opVal].sclRightCurve = new CtrlDXLabel(sclRightCurve, 3, opTarget + 12, keyScaleLabels);
ctrl.add(opCtrl[opVal].sclRightCurve); ctrl.add(opCtrl[opVal].sclRightCurve);
String sclRate; String sclRate;
sclRate << opName << " RATE SCALING"; sclRate << opName << " RATE SCALING";
opCtrl[opVal].sclRate = new CtrlDX(sclRate, 8, opTarget + 13); opCtrl[opVal].sclRate = new CtrlDX(sclRate, 7, opTarget + 13);
ctrl.add(opCtrl[opVal].sclRate); ctrl.add(opCtrl[opVal].sclRate);
String ampModSens; String ampModSens;
ampModSens << opName << " A MOD SENS."; ampModSens << opName << " A MOD SENS.";
opCtrl[opVal].ampModSens = new CtrlDX(ampModSens, 4, opTarget + 14); opCtrl[opVal].ampModSens = new CtrlDX(ampModSens, 3, opTarget + 14);
ctrl.add(opCtrl[opVal].ampModSens); ctrl.add(opCtrl[opVal].ampModSens);
String velModSens; String velModSens;
velModSens << opName << " KEY VELOCITY"; velModSens << opName << " KEY VELOCITY";
opCtrl[opVal].velModSens = new CtrlDX(velModSens, 8, opTarget + 15); opCtrl[opVal].velModSens = new CtrlDX(velModSens, 7, opTarget + 15);
ctrl.add(opCtrl[opVal].velModSens); ctrl.add(opCtrl[opVal].velModSens);
String opSwitchLabel; String opSwitchLabel;
@ -711,4 +703,3 @@ void DexedAudioProcessor::savePreference() {
prop.save(); prop.save();
} }

Write Preview
Loading…
Cancel
Save