Program store fix

Source/DXLookNFeel.cpp

@@ -146,24 +146,24 @@ void AlgoDisplay::paint(Graphics &g) {
 
     String algoTxt;
     algoTxt << (alg+1);
-    g.drawText(algoTxt, 0, 0, 21, 14, Justification::left, true);
+    g.drawText(algoTxt, 5, 1, 21, 14, Justification::left, true);
 }
 
 void AlgoDisplay::drawOp(Graphics &g, int x, int y, int num, bool feedback) {
     String txt;
     txt << num;
 
-    int offx = 25;
-    int offy = 18;
+    int offx = 24;
+    int offy = 17;
     
     g.setColour(Colour(0xFF0FC00F));
-    g.fillRect(x*offx+1, y*offy+1, offx-2, offy-1);
+    g.fillRect(x*offx+4, y*offy+3, offx-2, offy-1);
     g.setColour(Colour(0xFFFFFFFF));
-    g.drawText(txt, x*offx, y*offy, offx, offy, Justification::centred, true);
+    g.drawText(txt, x*offx+3, y*offy+2, offx+2, offy+2, Justification::centred, true);
     if ( feedback ) {
         g.setColour(Colour(0xFFFFFFFF));
-        int x1 = (x*offx) + 23;
-        g.drawLine(x1, y*offy+1, x1, y*offy+offy, 3);
+        int x1 = (x*offx) + 24;
+        g.drawLine(x1+1, y*offy+3, x1+1, y*offy+offy+2, 3);
     }
 }
 

Source/DXLookNFeel.h

@@ -33,6 +33,14 @@ public:
     void paint(Graphics &g);
 };
 
+class PitchEnvDisplay : public Component {
+    Env env;
+public:
+    char *pvalues;
+    
+    void paint(Graphics &g);
+};
+
 class AlgoDisplay : public Component {
     void drawOp(Graphics &g, int x, int y, int num, bool feedback);
 
@@ -44,10 +52,7 @@ public:
 };
 
 class DXLookNFeel : public LookAndFeel_V3 {
-    
 public:
-    const Colour white;
-    
     DXLookNFeel();
 };
 

Source/GlobalEditor.cpp

@@ -240,7 +240,7 @@ void GlobalEditor::resized()
     lfoDelay->setBounds (672, 64, 24, 24);
     cutoff->setBounds (8, 40, 48, 48);
     reso->setBounds (64, 40, 48, 48);
-    algoDisplay->setBounds (416, 8, 150, 72);
+    algoDisplay->setBounds (408, 8, 152, 74);
     pitchRate2->setBounds (776, 64, 32, 24);
     pitchRate3->setBounds (800, 64, 32, 24);
     pitchRate4->setBounds (824, 64, 32, 24);
@@ -465,7 +465,7 @@ BEGIN_JUCER_METADATA
           style="Rotary" textBoxPos="NoTextBox" textBoxEditable="1" textBoxWidth="80"
           textBoxHeight="20" skewFactor="1"/>
   <GENERICCOMPONENT name="algoDisplay" id="b26fb9e3b5f0bc37" memberName="algoDisplay"
-                    virtualName="" explicitFocusOrder="0" pos="416 8 150 72" class="AlgoDisplay"
+                    virtualName="" explicitFocusOrder="0" pos="408 8 152 74" class="AlgoDisplay"
                     params=""/>
   <SLIDER name="pitchRate2" id="73f386b3c91d3de4" memberName="pitchRate2"
           virtualName="" explicitFocusOrder="0" pos="776 64 32 24" min="0"

Source/PluginParam.cpp

@@ -459,15 +459,23 @@ void DexedAudioProcessor::packProgram(int idx, const char *name) {
         int pp = op*17;
         int up = op*21;
         
+        // left curves
         bulk[pp+11] = (data[up+11]&0x03) | ((data[up+12]&0x03) << 2);
-        bulk[pp+12] = (data[up+13]&0x07) | ((data[up+20]*0x0f) << 3);
-        bulk[pp+13] = (data[up+14]&0x03) | ((data[up+15]*0x07) << 2);
+        bulk[pp+12] = (data[up+13]&0x07) | ((data[up+20]&0x0f) << 3);
+        // kvs_ams
+        bulk[pp+13] = (data[up+14]&0x03) | ((data[up+15]&0x07) << 2);
+        // output lvl
         bulk[pp+14] = data[up+16];
+        // fcoarse_mode
+        bulk[pp+15] = (data[up+17]&0x01) | ((data[up+18]&0x1f) << 1);
+        // fine freq
+        bulk[pp+16] = data[up+19];      
     }
     memcpy(bulk + 102, data + 126, 9);      // pitch env, algo
     bulk[111] = (data[135]&0x07) | ((data[136]&0x01) << 3);
     memcpy(bulk + 112, data + 137, 4);      // lfo
     bulk[116] = (data[141]&0x01) | (((data[142]&0x07) << 1) | ((data[143]&0x07) << 4));
+    bulk[117] = data[144];
     int eos = 0;
     for(int i=0; i < 10; i++) {
         char c = name[i];