Fix up preset selection with two APCs

[SugarCubes.git] / _Presets.pde

diff --git a/_Presets.pde b/_Presets.pde
index f1855c63aa4f2c4c57eaba9f2030cc9b802ca108..1d1ca42b6340bb2ca963b2e291edf95433069376 100644 (file)
--- a/_Presets.pde
+++ b/_Presets.pde
@@ -61,16 +61,22 @@ class PresetManager implements LXParameter.Listener {
     listeners.add(listener);
   }
 
-  public void select(int index) {
-    presets[index].select();
+  public void dirty(LXPattern pattern) {
+    if (loadedPattern == pattern) {
+      onPresetDirty();
+    }
+  }
+
+  public void select(Engine.Deck deck, int index) {
+    presets[index].select(deck);
   }
 
-  public void store(int index) {
+  public void store(Engine.Deck deck, int index) {
     presets[index].store(midiEngine.getFocusedPattern());
     for (PresetListener listener : listeners) {
       listener.onPresetStored(presets[index]);
     }
-    select(index);
+    select(deck, index);
   }
   
   public void onPresetLoaded(Preset preset, LXPattern pattern) {
@@ -92,8 +98,10 @@ class PresetManager implements LXParameter.Listener {
   }
   
   private void onPresetDirty() {
-    for (PresetListener listener : listeners) {
-      listener.onPresetDirty(loadedPreset);
+    if (loadedPreset != null) {
+      for (PresetListener listener : listeners) {
+        listener.onPresetDirty(loadedPreset);
+      }
     }
   }
   
@@ -159,11 +167,19 @@ class Preset {
     for (LXParameter p : pattern.getParameters()) {
       parameters.put(p.getLabel(), p.getValuef());
     }
+    if (pattern instanceof DPat) {
+      DPat dpattern = (DPat) pattern;
+      for (DBool bool : dpattern.bools) {
+        parameters.put(bool.tag, bool.b ? 1.f : 0.f);
+      }
+      for (Pick pick : dpattern.picks) {
+        parameters.put(pick.tag, pick.CurRow + pick.CurCol/100.f);
+      }
+    }
     manager.write();
   }
   
-  public void select() {
-    Engine.Deck deck = midiEngine.getFocusedDeck();
+  public void select(Engine.Deck deck) {
     for (LXPattern pattern : deck.getPatterns()) {
       if (pattern.getClass().getName().equals(className)) {
         for (String pLabel : parameters.keySet()) {
@@ -172,8 +188,25 @@ class Preset {
               p.setValue(parameters.get(pLabel));
             }
           }
+          if (pattern instanceof DPat) {
+            DPat dpattern = (DPat) pattern;
+            for (DBool bool : dpattern.bools) {
+              if (bool.tag.equals(pLabel)) {
+                bool.set(bool.row, bool.col, parameters.get(pLabel) > 0);
+              }
+            }
+            for (Pick pick : dpattern.picks) {
+              if (pick.tag.equals(pLabel)) {
+                float f = parameters.get(pLabel);
+                pick.set((int) floor(f), (int) round((f%1)*100.));
+              }
+            }
+          }
         }
         deck.goPattern(pattern);
+        if (pattern instanceof DPat) {
+          ((DPat)pattern).updateLights();
+        }
         manager.onPresetLoaded(this, pattern);
         break;
       }