Tweaks to preset handling

[SugarCubes.git] / _Presets.pde

diff --git a/_Presets.pde b/_Presets.pde
index 2f716f2f1da9b27246137dda3116136b988460b8..ca3957ea4cbbb679ec1b45d03f40b7134021ea8b 100644 (file)
--- a/_Presets.pde
+++ b/_Presets.pde
@@ -1,7 +1,7 @@
 interface PresetListener {
-  public void onPresetLoaded(Preset preset);
-  public void onPresetDirty(Preset preset);
-  public void onPresetStored(Preset preset);
+  public void onPresetLoaded(Engine.Deck deck, Preset preset);
+  public void onPresetDirty(Engine.Deck deck, Preset preset);
+  public void onPresetStored(Engine.Deck deck, Preset preset);
   public void onPresetUnloaded();
 }
 
@@ -36,10 +36,8 @@ class PresetManager implements LXParameter.Listener {
     for (Engine.Deck deck : lx.engine.getDecks()) {
       deck.addListener(new Engine.AbstractListener() {
         public void patternDidChange(Engine.Deck deck, LXPattern pattern) {
-          if (midiEngine.getFocusedDeck() == deck) {
-            if (pattern != loadedPattern) {
-              onPresetDirty();
-            }
+          if (pattern != loadedPattern) {
+            onPresetDirty(deck);
           }
         }
       });
@@ -60,26 +58,35 @@ class PresetManager implements LXParameter.Listener {
   public void addListener(PresetListener listener) {
     listeners.add(listener);
   }
+  
+  public Engine.Deck deckForPattern(LXPattern pattern) {
+    for (Engine.Deck deck : lx.engine.getDecks()) {
+      for (LXPattern p : deck.getPatterns()) {
+        if (p == pattern) {
+          return deck;
+        }
+      }
+    }
+    return null;
+  }
 
   public void dirty(LXPattern pattern) {
-    if (loadedPattern == pattern) {
-      onPresetDirty();
-    }
+    onPresetDirty(deckForPattern(pattern));
   }
 
-  public void select(int index) {
-    presets[index].select();
+  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]);
+      listener.onPresetStored(deck, presets[index]);
     }
-    select(index);
+    select(deck, index);
   }
   
-  public void onPresetLoaded(Preset preset, LXPattern pattern) {
+  public void onPresetLoaded(Engine.Deck deck, Preset preset, LXPattern pattern) {
     if (loadedPattern != pattern) {
       if (loadedPattern != null) {
         for (LXParameter p : loadedPattern.getParameters()) {
@@ -88,7 +95,7 @@ class PresetManager implements LXParameter.Listener {
       }
     }
     for (PresetListener listener : listeners) {
-      listener.onPresetLoaded(preset);
+      listener.onPresetLoaded(deck, preset);
     }
     loadedPreset = preset;
     loadedPattern = pattern;
@@ -97,16 +104,16 @@ class PresetManager implements LXParameter.Listener {
     }
   }
   
-  private void onPresetDirty() {
+  private void onPresetDirty(Engine.Deck deck) {
     if (loadedPreset != null) {
       for (PresetListener listener : listeners) {
-        listener.onPresetDirty(loadedPreset);
+        listener.onPresetDirty(deck, loadedPreset);
       }
     }
   }
   
   public void onParameterChanged(LXParameter p) {
-    onPresetDirty();
+    onPresetDirty(deckForPattern(loadedPattern));
   }
   
   public void write() {
@@ -179,8 +186,7 @@ class Preset {
     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()) {
@@ -208,7 +214,7 @@ class Preset {
         if (pattern instanceof DPat) {
           ((DPat)pattern).updateLights();
         }
-        manager.onPresetLoaded(this, pattern);
+        manager.onPresetLoaded(deck, this, pattern);
         break;
       }
     }