plugin/ui.cpp

@@ -7,14 +7,6 @@ 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)
@@ -26,72 +18,140 @@ DistrhoUIchassis::DistrhoUIchassis() : UI(Art::backgroundWidth, Art::backgroundH
     Image whiteSlider(Art::whiteData, Art::sliderWidth, Art::sliderHeight, kImageFormatRGBA);
 
     xSliderLFORate = new ImageSlider(this, orangeSlider);
-    prepSlider(xSliderLFORate, Chassis::pLFORate, 50, 72);
+    xSliderLFORate->setId(Chassis::pLFORate);
+    xSliderLFORate->setStartPos(50, 72);
+    xSliderLFORate->setEndPos(50, 151);
+    xSliderLFORate->setRange(0, 127.0f);
+    xSliderLFORate->setInverted(true);
     xSliderLFORate->setCallback(this);
 
     xSliderLFODelay = new ImageSlider(this, orangeSlider);
-    prepSlider(xSliderLFODelay, Chassis::pLFODelay, 90, 72);
+    xSliderLFODelay->setId(Chassis::pLFODelay);
+    xSliderLFODelay->setStartPos(90, 72);
+    xSliderLFODelay->setEndPos(90, 151);
+    xSliderLFODelay->setRange(0, 127.0f);
+    xSliderLFODelay->setInverted(true);
     xSliderLFODelay->setCallback(this);
 
     xSliderLFODepth = new ImageSlider(this, greenSlider);
-    prepSlider(xSliderLFODepth, Chassis::pLFODepth, 292, 72);
+    xSliderLFODepth->setId(Chassis::pLFODepth);
+    xSliderLFODepth->setStartPos(292, 72);
+    xSliderLFODepth->setEndPos(292, 151);
+    xSliderLFODepth->setRange(0, 127.0f);
+    xSliderLFODepth->setInverted(true);
     xSliderLFODepth->setCallback(this);
 
     xSliderPWMDepth = new ImageSlider(this, greenSlider);
-    prepSlider(xSliderPWMDepth, Chassis::pPWMDepth, 331, 72);
+    xSliderPWMDepth->setId(Chassis::pPWMDepth);
+    xSliderPWMDepth->setStartPos(331, 72);
+    xSliderPWMDepth->setEndPos(331, 151);
+    xSliderPWMDepth->setRange(0, 127.0f);
+    xSliderPWMDepth->setInverted(true);
     xSliderPWMDepth->setCallback(this);
 
     xSliderSubLevel = new ImageSlider(this, greenSlider);
-    prepSlider(xSliderSubLevel, Chassis::pSubLevel, 517, 72);
+    xSliderSubLevel->setId(Chassis::pSubLevel);
+    xSliderSubLevel->setStartPos(517, 72);
+    xSliderSubLevel->setEndPos(517, 151);
+    xSliderSubLevel->setRange(0, 127.0f);
+    xSliderSubLevel->setInverted(true);
     xSliderSubLevel->setCallback(this);
 
     xSliderNoiseLevel = new ImageSlider(this, greenSlider);
-    prepSlider(xSliderNoiseLevel, Chassis::pNoiseLevel, 558, 72);
+    xSliderNoiseLevel->setId(Chassis::pNoiseLevel);
+    xSliderNoiseLevel->setStartPos(558, 72);
+    xSliderNoiseLevel->setEndPos(558, 151);
+    xSliderNoiseLevel->setRange(0, 127.0f);
+    xSliderNoiseLevel->setInverted(true);
     xSliderNoiseLevel->setCallback(this);
 
-    // FIXME - put the stops back in
     xSliderHPF = new ImageSlider(this, blueSlider);
-    prepSlider(xSliderHPF, Chassis::pHPF, 618, 72);
+    xSliderHPF->setId(Chassis::pHPF);
+    xSliderHPF->setStartPos(618, 72);
+    xSliderHPF->setEndPos(618, 151);
+    xSliderHPF->setRange(0, 3.0f);
+    xSliderHPF->setStep(1);
+    xSliderHPF->setInverted(true);
     xSliderHPF->setCallback(this);
 
     xSliderCutoff = new ImageSlider(this, blueSlider);
-    prepSlider(xSliderCutoff, Chassis::pCutoff, 21, 261);
+    xSliderCutoff->setId(Chassis::pCutoff);
+    xSliderCutoff->setStartPos(21, 261);
+    xSliderCutoff->setEndPos(21, 340);
+    xSliderCutoff->setRange(0, 127.0f);
+    xSliderCutoff->setInverted(true);
     xSliderCutoff->setCallback(this);
 
     xSliderRes = new ImageSlider(this, blueSlider);
-    prepSlider(xSliderRes, Chassis::pRes, 60, 261);
+    xSliderRes->setId(Chassis::pRes);
+    xSliderRes->setStartPos(60, 261);
+    xSliderRes->setEndPos(60, 340);
+    xSliderRes->setRange(0, 127.0f);
+    xSliderRes->setInverted(true);
     xSliderRes->setCallback(this);
 
     xSliderEnv = new ImageSlider(this, blueSlider);
-    prepSlider(xSliderEnv, Chassis::pEnv, 144, 261);
+    xSliderEnv->setId(Chassis::pEnv);
+    xSliderEnv->setStartPos(144, 261);
+    xSliderEnv->setEndPos(144, 340);
+    xSliderEnv->setRange(0, 127.0f);
+    xSliderEnv->setInverted(true);
     xSliderEnv->setCallback(this);
 
     xSliderLfo = new ImageSlider(this, blueSlider);
-    prepSlider(xSliderLfo, Chassis::pLfo, 183, 261);
+    xSliderLfo->setId(Chassis::pLfo);
+    xSliderLfo->setStartPos(183, 261);
+    xSliderLfo->setEndPos(183, 340);
+    xSliderLfo->setRange(0, 127.0f);
+    xSliderLfo->setInverted(true);
     xSliderLfo->setCallback(this);
 
     xSliderKyb = new ImageSlider(this, blueSlider);
-    prepSlider(xSliderKyb, Chassis::pKyb, 222, 261);
+    xSliderKyb->setId(Chassis::pKyb);
+    xSliderKyb->setStartPos(222, 261);
+    xSliderKyb->setEndPos(222, 340);
+    xSliderKyb->setRange(0, 127.0f);
+    xSliderKyb->setInverted(true);
     xSliderKyb->setCallback(this);
 
     xSliderVCALevel = new ImageSlider(this, whiteSlider);
-    prepSlider(xSliderVCALevel, Chassis::pVCALevel, 314, 261);
+    xSliderVCALevel->setId(Chassis::pVCALevel);
+    xSliderVCALevel->setStartPos(314, 261);
+    xSliderVCALevel->setEndPos(314, 340);
+    xSliderVCALevel->setRange(0, 127.0f);
+    xSliderVCALevel->setInverted(true);
     xSliderVCALevel->setCallback(this);
 
     xSliderAtk = new ImageSlider(this, whiteSlider);
-    prepSlider(xSliderAtk, Chassis::pVCALevel, 375, 261);
+    xSliderAtk->setId(Chassis::pAtk);
+    xSliderAtk->setStartPos(375, 261);
+    xSliderAtk->setEndPos(375, 340);
+    xSliderAtk->setRange(0, 127.0f);
+    xSliderAtk->setInverted(true);
     xSliderAtk->setCallback(this);
 
     xSliderDcy = new ImageSlider(this, whiteSlider);
-    prepSlider(xSliderDcy, Chassis::pDcy, 414, 261);
+    xSliderDcy->setId(Chassis::pDcy);
+    xSliderDcy->setStartPos(414, 261);
+    xSliderDcy->setEndPos(414, 340);
+    xSliderDcy->setRange(0, 127.0f);
+    xSliderDcy->setInverted(true);
     xSliderDcy->setCallback(this);
 
     xSliderStn = new ImageSlider(this, whiteSlider);
-    prepSlider(xSliderStn, Chassis::pStn, 454, 261);
+    xSliderStn->setId(Chassis::pStn);
+    xSliderStn->setStartPos(454, 261);
+    xSliderStn->setEndPos(454, 340);
+    xSliderStn->setRange(0, 127.0f);
+    xSliderStn->setInverted(true);
     xSliderStn->setCallback(this);
 
     xSliderRls = new ImageSlider(this, whiteSlider);
-    prepSlider(xSliderRls, Chassis::pRls, 493, 261);
+    xSliderRls->setId(Chassis::pRls);
+    xSliderRls->setStartPos(493, 261);
+    xSliderRls->setEndPos(493, 340);
+    xSliderRls->setRange(0, 127.0f);
+    xSliderRls->setInverted(true);
     xSliderRls->setCallback(this);
 
     xBtn16ft = new ImageButton(this, Image(Art::orngBtnUp, Art::orngBtnWidth, Art::orngBtnHeight, kImageFormatRGB),
@@ -112,6 +172,8 @@ DistrhoUIchassis::DistrhoUIchassis() : UI(Art::backgroundWidth, Art::backgroundH
     programLoaded(0);
 }
 
+
+
 DistrhoUIchassis::~DistrhoUIchassis() {
     printf("Called destructor for UI\n");
 }
@@ -195,15 +257,9 @@ void DistrhoUIchassis::parameterChanged(uint32_t index, float value) {
             sw1 &= 0x9f;
             //60, 40, 00
             switch((int)value) {
-                case 0:
+                case 0: sw1 |= 0x60; break;
-                    sw1 |= 0x60;
+                case 1: sw1 |= 0x40; break;
-                    break;
+                case 2: sw1 |= 0x00; break;
-                case 1:
-                    sw1 |= 0x40;
-                    break;
-                case 2:
-                    sw1 |= 0x00;
-                    break;
             }
     }
 }
@@ -224,20 +280,10 @@ void DistrhoUIchassis::imageButtonClicked(ImageButton* imgBtn, int) {
     int id = imgBtn->getId();
     //printf("imagebutton %d\n", id);
     switch (id) {
-        case Chassis::btn16:
+        case Chassis::btn16: sw1 &= 0xf8; sw1 |= 0x01; break;
-            sw1 &= 0xf8;
+        case Chassis::btn8: sw1 &= 0xf8; sw1 |= 0x02; break;
-            sw1 |= 0x01;
+        case Chassis::btn4: sw1 &= 0xf8; sw1 |= 0x04; break;
-            break;
+        default: break;
-        case Chassis::btn8:
-            sw1 &= 0xf8;
-            sw1 |= 0x02;
-            break;
-        case Chassis::btn4:
-            sw1 &= 0xf8;
-            sw1 |= 0x04;
-            break;
-        default:
-            break;
     }
 }