fixed LEDs

plugin/DistrhoPluginInfo.h

@@ -30,4 +30,38 @@
 #define DISTRHO_PLUGIN_WANT_PROGRAMS 1
 #define DISTRHO_PLUGIN_HAS_UI 1
 
+enum Parameters {
+   pLFORate,
+   pLFODelay,
+   
+   pVCORange,
+   pLFODepth,
+   pPWMDepth,
+   pSqr,
+   pSaw,
+   pSubLevel,
+   pNoiseLevel,
+
+   pHPF,
+   pCutoff,
+   pRes,
+   pEnv,
+   pLfo,
+   pKyb,
+
+   pVCALevel,
+
+   pAtk,
+   pDcy,
+   pStn,
+   pRls,
+
+   pChorus,
+
+   parameterCount,
+
+   btn16, btn8, btn4, btnPls, btnSaw, btnCh0, btnCh1, btnCh2
+};
+
+
 #endif

plugin/chassis.hpp

@@ -27,39 +27,6 @@ START_NAMESPACE_DISTRHO
 
 class Chassis : public Plugin {
    public:
-    enum Parameters {
-        pLFORate,
-        pLFODelay,
-        
-        pVCORange,
-        pLFODepth,
-        pPWMDepth,
-        pSqr,
-        pSaw,
-        pSubLevel,
-        pNoiseLevel,
-
-        pHPF,
-        pCutoff,
-        pRes,
-        pEnv,
-        pLfo,
-        pKyb,
-
-        pVCALevel,
-
-        pAtk,
-        pDcy,
-        pStn,
-        pRls,
-
-        pChorus,
-
-        parameterCount,
-
-        btn16, btn8, btn4, btnPls, btnSaw, btnCh0, btnCh1, btnCh2
-    };
-
     Chassis();
 
    protected:

plugin/ui.cpp

@@ -7,6 +7,14 @@ START_NAMESPACE_DISTRHO
 
 namespace Art = Artwork;
 
+void prepSlider(ImageSlider* s, uint id, int x, int y) {
+    s->setId(id);
+    s->setStartPos(x, y);
+    s->setEndPos(x, y + 79);  // 80px high
+    s->setInverted(true);
+    s->setRange(0, 127.0f);
+}
+
 DistrhoUIchassis::DistrhoUIchassis() : UI(Art::backgroundWidth, Art::backgroundHeight, true),
                                        fImgBackground(Art::backgroundData, Art::backgroundWidth, Art::backgroundHeight, kImageFormatRGB),
                                        fImgLedOn(Art::ledOnData, Art::ledWidth, Art::ledHeight, kImageFormatRGBA)
@@ -18,248 +26,185 @@ DistrhoUIchassis::DistrhoUIchassis() : UI(Art::backgroundWidth, Art::backgroundH
     Image whiteSlider(Art::whiteData, Art::sliderWidth, Art::sliderHeight, kImageFormatRGBA);
 
     xSliderLFORate = new ImageSlider(this, orangeSlider);
-    xSliderLFORate->setId(Chassis::pLFORate);
-    xSliderLFORate->setStartPos(50, 72);
-    xSliderLFORate->setEndPos(50, 151);
-    xSliderLFORate->setRange(0, 127.0f);
-    xSliderLFORate->setInverted(true);
+    prepSlider(xSliderLFORate, pLFORate, 46, 72);
     xSliderLFORate->setCallback(this);
 
     xSliderLFODelay = new ImageSlider(this, orangeSlider);
-    xSliderLFODelay->setId(Chassis::pLFODelay);
-    xSliderLFODelay->setStartPos(90, 72);
-    xSliderLFODelay->setEndPos(90, 151);
-    xSliderLFODelay->setRange(0, 127.0f);
-    xSliderLFODelay->setInverted(true);
+    prepSlider(xSliderLFODelay, pLFODelay, 84, 72);
     xSliderLFODelay->setCallback(this);
 
     xSliderLFODepth = new ImageSlider(this, greenSlider);
-    xSliderLFODepth->setId(Chassis::pLFODepth);
-    xSliderLFODepth->setStartPos(292, 72);
-    xSliderLFODepth->setEndPos(292, 151);
-    xSliderLFODepth->setRange(0, 127.0f);
-    xSliderLFODepth->setInverted(true);
+    prepSlider(xSliderLFODepth, pLFODepth, 290, 72);
     xSliderLFODepth->setCallback(this);
 
     xSliderPWMDepth = new ImageSlider(this, greenSlider);
-    xSliderPWMDepth->setId(Chassis::pPWMDepth);
-    xSliderPWMDepth->setStartPos(331, 72);
-    xSliderPWMDepth->setEndPos(331, 151);
-    xSliderPWMDepth->setRange(0, 127.0f);
-    xSliderPWMDepth->setInverted(true);
+    prepSlider(xSliderPWMDepth, pPWMDepth, 329, 72);
     xSliderPWMDepth->setCallback(this);
 
     xSliderSubLevel = new ImageSlider(this, greenSlider);
-    xSliderSubLevel->setId(Chassis::pSubLevel);
-    xSliderSubLevel->setStartPos(517, 72);
-    xSliderSubLevel->setEndPos(517, 151);
-    xSliderSubLevel->setRange(0, 127.0f);
-    xSliderSubLevel->setInverted(true);
+    prepSlider(xSliderSubLevel, pSubLevel, 510, 72);
     xSliderSubLevel->setCallback(this);
 
     xSliderNoiseLevel = new ImageSlider(this, greenSlider);
-    xSliderNoiseLevel->setId(Chassis::pNoiseLevel);
-    xSliderNoiseLevel->setStartPos(558, 72);
-    xSliderNoiseLevel->setEndPos(558, 151);
-    xSliderNoiseLevel->setRange(0, 127.0f);
-    xSliderNoiseLevel->setInverted(true);
+    prepSlider(xSliderNoiseLevel, pNoiseLevel, 551, 72);
     xSliderNoiseLevel->setCallback(this);
 
     xSliderHPF = new ImageSlider(this, blueSlider);
-    xSliderHPF->setId(Chassis::pHPF);
-    xSliderHPF->setStartPos(618, 72);
-    xSliderHPF->setEndPos(618, 151);
-    xSliderHPF->setRange(0, 3.0f);
+    prepSlider(xSliderHPF, pHPF, 618, 72);
     xSliderHPF->setStep(1);
-    xSliderHPF->setInverted(true);
+    xSliderHPF->setRange(0,3);
     xSliderHPF->setCallback(this);
 
     xSliderCutoff = new ImageSlider(this, blueSlider);
-    xSliderCutoff->setId(Chassis::pCutoff);
-    xSliderCutoff->setStartPos(21, 261);
-    xSliderCutoff->setEndPos(21, 340);
-    xSliderCutoff->setRange(0, 127.0f);
-    xSliderCutoff->setInverted(true);
+    prepSlider(xSliderCutoff, pCutoff, 26, 261);
     xSliderCutoff->setCallback(this);
 
     xSliderRes = new ImageSlider(this, blueSlider);
-    xSliderRes->setId(Chassis::pRes);
-    xSliderRes->setStartPos(60, 261);
-    xSliderRes->setEndPos(60, 340);
-    xSliderRes->setRange(0, 127.0f);
-    xSliderRes->setInverted(true);
+    prepSlider(xSliderRes, pRes, 65, 261);
     xSliderRes->setCallback(this);
 
     xSliderEnv = new ImageSlider(this, blueSlider);
-    xSliderEnv->setId(Chassis::pEnv);
-    xSliderEnv->setStartPos(144, 261);
-    xSliderEnv->setEndPos(144, 340);
-    xSliderEnv->setRange(0, 127.0f);
-    xSliderEnv->setInverted(true);
+    prepSlider(xSliderEnv, pEnv, 149, 261);
     xSliderEnv->setCallback(this);
 
     xSliderLfo = new ImageSlider(this, blueSlider);
-    xSliderLfo->setId(Chassis::pLfo);
-    xSliderLfo->setStartPos(183, 261);
-    xSliderLfo->setEndPos(183, 340);
-    xSliderLfo->setRange(0, 127.0f);
-    xSliderLfo->setInverted(true);
+    prepSlider(xSliderLfo, pLfo, 189, 261);
     xSliderLfo->setCallback(this);
 
     xSliderKyb = new ImageSlider(this, blueSlider);
-    xSliderKyb->setId(Chassis::pKyb);
-    xSliderKyb->setStartPos(222, 261);
-    xSliderKyb->setEndPos(222, 340);
-    xSliderKyb->setRange(0, 127.0f);
-    xSliderKyb->setInverted(true);
+    prepSlider(xSliderKyb, pKyb, 228, 261);
     xSliderKyb->setCallback(this);
 
     xSliderVCALevel = new ImageSlider(this, whiteSlider);
-    xSliderVCALevel->setId(Chassis::pVCALevel);
-    xSliderVCALevel->setStartPos(314, 261);
-    xSliderVCALevel->setEndPos(314, 340);
-    xSliderVCALevel->setRange(0, 127.0f);
-    xSliderVCALevel->setInverted(true);
+    prepSlider(xSliderVCALevel, pVCALevel, 319, 261);
     xSliderVCALevel->setCallback(this);
 
     xSliderAtk = new ImageSlider(this, whiteSlider);
-    xSliderAtk->setId(Chassis::pAtk);
-    xSliderAtk->setStartPos(375, 261);
-    xSliderAtk->setEndPos(375, 340);
-    xSliderAtk->setRange(0, 127.0f);
-    xSliderAtk->setInverted(true);
+    prepSlider(xSliderAtk, pVCALevel, 385, 261);
     xSliderAtk->setCallback(this);
 
     xSliderDcy = new ImageSlider(this, whiteSlider);
-    xSliderDcy->setId(Chassis::pDcy);
-    xSliderDcy->setStartPos(414, 261);
-    xSliderDcy->setEndPos(414, 340);
-    xSliderDcy->setRange(0, 127.0f);
-    xSliderDcy->setInverted(true);
+    prepSlider(xSliderDcy, pDcy, 425, 261);
     xSliderDcy->setCallback(this);
 
     xSliderStn = new ImageSlider(this, whiteSlider);
-    xSliderStn->setId(Chassis::pStn);
-    xSliderStn->setStartPos(454, 261);
-    xSliderStn->setEndPos(454, 340);
-    xSliderStn->setRange(0, 127.0f);
-    xSliderStn->setInverted(true);
+    prepSlider(xSliderStn, pStn, 465, 261);
     xSliderStn->setCallback(this);
 
     xSliderRls = new ImageSlider(this, whiteSlider);
-    xSliderRls->setId(Chassis::pRls);
-    xSliderRls->setStartPos(493, 261);
-    xSliderRls->setEndPos(493, 340);
-    xSliderRls->setRange(0, 127.0f);
-    xSliderRls->setInverted(true);
+    prepSlider(xSliderRls, pRls, 505, 261);
     xSliderRls->setCallback(this);
 
     xBtn16ft = new ImageButton(this, Image(Art::orngBtnUp, Art::orngBtnWidth, Art::orngBtnHeight, kImageFormatRGB),
-    Image(Art::orngBtnDn, Art::orngBtnWidth, Art::orngBtnHeight, kImageFormatRGB));
-    xBtn16ft->setAbsolutePos(149,103);
-    xBtn16ft->setId(Chassis::btn16);
+                               Image(Art::orngBtnDn, Art::orngBtnWidth, Art::orngBtnHeight, kImageFormatRGB));
+    xBtn16ft->setAbsolutePos(149, 103);
+    xBtn16ft->setId(btn16);
     xBtn16ft->setCallback(this);
     xBtn8ft = new ImageButton(this, Image(Art::orngBtnUp, Art::orngBtnWidth, Art::orngBtnHeight, kImageFormatRGB),
-    Image(Art::orngBtnDn, Art::orngBtnWidth, Art::orngBtnHeight, kImageFormatRGB));
-    xBtn8ft->setAbsolutePos(190,103);
-    xBtn8ft->setId(Chassis::btn8);
+                              Image(Art::orngBtnDn, Art::orngBtnWidth, Art::orngBtnHeight, kImageFormatRGB));
+    xBtn8ft->setAbsolutePos(190, 103);
+    xBtn8ft->setId(btn8);
     xBtn8ft->setCallback(this);
     xBtn4ft = new ImageButton(this, Image(Art::orngBtnUp, Art::orngBtnWidth, Art::orngBtnHeight, kImageFormatRGB),
-    Image(Art::orngBtnDn, Art::orngBtnWidth, Art::orngBtnHeight, kImageFormatRGB));
-    xBtn4ft->setAbsolutePos(231,103);
-    xBtn4ft->setId(Chassis::btn4);
+                              Image(Art::orngBtnDn, Art::orngBtnWidth, Art::orngBtnHeight, kImageFormatRGB));
+    xBtn4ft->setAbsolutePos(231, 103);
+    xBtn4ft->setId(btn4);
     xBtn4ft->setCallback(this);
     programLoaded(0);
 }
 
-
-
 DistrhoUIchassis::~DistrhoUIchassis() {
     printf("Called destructor for UI\n");
 }
 
 void DistrhoUIchassis::programLoaded(uint32_t index) {
     switch (index) {
-        case Chassis::pLFORate:
+        case pLFORate:
             xSliderLFORate->setValue(0.5);
             break;
-        case Chassis::pLFODelay:
+        case pLFODelay:
             xSliderLFODelay->setValue(0.5);
             break;
     }
 }
 void DistrhoUIchassis::parameterChanged(uint32_t index, float value) {
     switch (index) {
-        case Chassis::pLFORate:
+        case pLFORate:
             xSliderLFORate->setValue(value);
             break;
-        case Chassis::pLFODelay:
+        case pLFODelay:
             xSliderLFODelay->setValue(value);
             break;
-        case Chassis::pLFODepth:
+        case pLFODepth:
             xSliderLFODepth->setValue(value);
             break;
-        case Chassis::pPWMDepth:
+        case pPWMDepth:
             xSliderPWMDepth->setValue(value);
             break;
-        case Chassis::pSubLevel:
+        case pSubLevel:
             xSliderSubLevel->setValue(value);
             break;
-        case Chassis::pNoiseLevel:
+        case pNoiseLevel:
             xSliderNoiseLevel->setValue(value);
             break;
-        case Chassis::pHPF:
+        case pHPF:
             xSliderHPF->setValue(value);
             break;
-        case Chassis::pCutoff:
+        case pCutoff:
             xSliderCutoff->setValue(value);
             break;
-        case Chassis::pRes:
+        case pRes:
             xSliderRes->setValue(value);
             break;
-        case Chassis::pEnv:
+        case pEnv:
             xSliderEnv->setValue(value);
             break;
-        case Chassis::pLfo:
+        case pLfo:
             xSliderLfo->setValue(value);
             break;
-        case Chassis::pKyb:
+        case pKyb:
             xSliderKyb->setValue(value);
             break;
-        case Chassis::pAtk:
+        case pAtk:
             xSliderAtk->setValue(value);
             break;
-        case Chassis::pDcy:
+        case pDcy:
             xSliderDcy->setValue(value);
             break;
-        case Chassis::pStn:
+        case pStn:
             xSliderStn->setValue(value);
             break;
-        case Chassis::pRls:
+        case pRls:
             xSliderRls->setValue(value);
             break;
         // now the switches
-        case Chassis::pVCORange:
+        case pVCORange:
             sw1 &= 0xf8;  // mask
             if (value > 2) value = 2;
             sw1 |= (1 << (int)value);
             break;
-        case Chassis::pSqr:
+        case pSqr:
             sw1 &= 0xf7;
             sw1 |= ((value >= 0.5)) << 3;
             break;
-        case Chassis::pSaw:
+        case pSaw:
             sw1 &= 0xef;
             sw1 |= (value > 0.5) << 4;
             break;
 
-            case Chassis::pChorus:
+        case pChorus:
             sw1 &= 0x9f;
-            //60, 40, 00
-            switch((int)value) {
-                case 0: sw1 |= 0x60; break;
-                case 1: sw1 |= 0x40; break;
-                case 2: sw1 |= 0x00; break;
+            // 60, 40, 00
+            switch ((int)value) {
+                case 0:
+                    sw1 |= 0x60;
+                    break;
+                case 1:
+                    sw1 |= 0x40;
+                    break;
+                case 2:
+                    sw1 |= 0x00;
+                    break;
             }
     }
 }
@@ -276,14 +221,24 @@ void DistrhoUIchassis::imageSliderValueChanged(ImageSlider* slider, float value)
     setParameterValue(slider->getId(), value);
 }
 
-void DistrhoUIchassis::imageButtonClicked(ImageButton *imgBtn, int) {
+void DistrhoUIchassis::imageButtonClicked(ImageButton* imgBtn, int) {
     int id = imgBtn->getId();
-    //printf("imagebutton %d\n", id);
+    // printf("imagebutton %d\n", id);
     switch (id) {
-        case Chassis::btn16: sw1 &= 0xf8; sw1 |= 0x01; break;
-        case Chassis::btn8: sw1 &= 0xf8; sw1 |= 0x02; break;
-        case Chassis::btn4: sw1 &= 0xf8; sw1 |= 0x04; break;
-        default: break;
+        case btn16:
+            sw1 &= 0xf8;
+            sw1 |= 0x01;
+            break;
+        case btn8:
+            sw1 &= 0xf8;
+            sw1 |= 0x02;
+            break;
+        case btn4:
+            sw1 &= 0xf8;
+            sw1 |= 0x04;
+            break;
+        default:
+            break;
     }
 }
 
@@ -297,8 +252,8 @@ void DistrhoUIchassis::onDisplay() {
     if (sw1 & 0x04) fImgLedOn.drawAt(context, 238, 77);             // 4'
     if (sw1 & 0x08) fImgLedOn.drawAt(context, 427, 77);             // pulse
     if (sw1 & 0x10) fImgLedOn.drawAt(context, 465, 77);             // saw
-    if ((sw1 & 0x60) == 0x40) fImgLedOn.drawAt(context, 604, 269);  // chorus 1
-    if ((sw1 & 0x60) == 0x00) fImgLedOn.drawAt(context, 644, 269);  // chorus 2
+    if ((sw1 & 0x60) == 0x40) fImgLedOn.drawAt(context, 612, 267);  // chorus 1
+    if ((sw1 & 0x60) == 0x00) fImgLedOn.drawAt(context, 652, 267);  // chorus 2
 };
 
 UI* createUI() {