Reverse operator order

pull/1/head
asb2m10 11 years ago
parent 0f7f54ab0e
commit bcb75ac22f
  1. BIN
      Builds/MacOSX/Dexed.xcodeproj/project.xcworkspace/xcuserdata/asb2m10.xcuserdatad/UserInterfaceState.xcuserstate
  2. 3
      Source/OperatorEditor.cpp
  3. 36
      Source/PluginParam.cpp

@ -307,7 +307,8 @@ void OperatorEditor::comboBoxChanged (ComboBox* comboBoxThatHasChanged)
//[MiscUserCode] You can add your own definitions of your custom methods or any other code here... //[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
void OperatorEditor::bind(DexedAudioProcessor *parent, int op) { void OperatorEditor::bind(DexedAudioProcessor *parent, int op) {
int targetNum = op+1; int targetNum = op+1;
op=5-op;
String text = "op"; String text = "op";
text << "OP"; text << "OP";
text << targetNum; text << targetNum;

@ -157,45 +157,47 @@ void DexedAudioProcessor::initCtrl() {
// fill operator values; // fill operator values;
for(int i=0;i<6;i++) { for(int i=0;i<6;i++) {
// In the Sysex, OP6 comes first, then OP5... // In the Sysex, OP6 comes first, then OP5...
//int opTarget = (5-i) * 21; int opTarget = (5-i) * 21;
// In the Sysex, OP6 comes first, then OP5... // In the Sysex, OP6 comes first, then OP5...
int opTarget = i * 21; //int opTarget = i * 21;
int opVal = 5-i;
for(int j=0;j<4;j++) { for(int j=0;j<4;j++) {
String opRate; String opRate;
opRate << "OP" << (i+1) << "-EGR" << (j+1); opRate << "OP" << (i+1) << "-EGR" << (j+1);
opCtrl[i].egRate[j] = new CtrlInt(opRate, 100, opTarget+j); opCtrl[opVal].egRate[j] = new CtrlInt(opRate, 100, opTarget+j);
ctrl.add(opCtrl[i].egRate[j]); ctrl.add(opCtrl[opVal].egRate[j]);
String opLevel; String opLevel;
opLevel << "OP" << (i+1) << "-EGL" << (j+1); opLevel << "OP" << (i+1) << "-EGL" << (j+1);
opCtrl[i].egLevel[j] = new CtrlInt(opLevel, 100, opTarget+j+4); opCtrl[opVal].egLevel[j] = new CtrlInt(opLevel, 100, opTarget+j+4);
ctrl.add(opCtrl[i].egLevel[j]); ctrl.add(opCtrl[opVal].egLevel[j]);
} }
String opVol; String opVol;
opVol << "OP" << (i+1) << "-LEVEL"; opVol << "OP" << (i+1) << "-LEVEL";
opCtrl[i].level = new CtrlInt(opVol, 100, opTarget+16); opCtrl[opVal].level = new CtrlInt(opVol, 100, opTarget+16);
ctrl.add(opCtrl[i].level); ctrl.add(opCtrl[opVal].level);
String opMode; String opMode;
opMode << "OP" << (i+1) << "-MODE"; opMode << "OP" << (i+1) << "-MODE";
opCtrl[i].opMode = new CtrlInt(opMode, 1, opTarget+17); opCtrl[opVal].opMode = new CtrlInt(opMode, 1, opTarget+17);
ctrl.add(opCtrl[i].opMode); ctrl.add(opCtrl[opVal].opMode);
String coarse; String coarse;
coarse << "OP" << (i+1) << "-COARSE"; coarse << "OP" << (i+1) << "-COARSE";
opCtrl[i].coarse = new CtrlInt(coarse, 32, opTarget+18, true); opCtrl[opVal].coarse = new CtrlInt(coarse, 32, opTarget+18);
ctrl.add(opCtrl[i].coarse); ctrl.add(opCtrl[opVal].coarse);
String fine; String fine;
fine << "OP" << (i+1) << "-FINE"; fine << "OP" << (i+1) << "-FINE";
opCtrl[i].fine = new CtrlInt(fine, 100, opTarget+19); opCtrl[opVal].fine = new CtrlInt(fine, 100, opTarget+19);
ctrl.add(opCtrl[i].fine); ctrl.add(opCtrl[opVal].fine);
String detune; String detune;
detune << "OP" << (i+1) << "-DETUNE"; detune << "OP" << (i+1) << "-DETUNE";
opCtrl[i].detune = new CtrlInt(detune, 15, opTarget+20); opCtrl[opVal].detune = new CtrlInt(detune, 15, opTarget+20);
ctrl.add(opCtrl[i].detune); ctrl.add(opCtrl[opVal].detune);
} }
algo = new CtrlInt("Algorithm", 32, 134, true); algo = new CtrlInt("Algorithm", 32, 134, true);

Loading…
Cancel
Save