Two APCs with deck focus and presets lights work on each

diff --git a/_MIDI.pde b/_MIDI.pde
index fc06538daf342eeac6871748586bcdddc19812ab..1a2f01512a6c62712f6133db0c0265b6d0a539bb 100644 (file)
--- a/_MIDI.pde
+++ b/_MIDI.pde
@@ -699,16 +699,22 @@ class APC40MidiOutput implements LXParameter.Listener, GridOutput {
       }
     }
     presetManager.addListener(new PresetListener() {
-      public void onPresetLoaded(Preset preset) {
-        for (int i = 0; i < 8; ++i) {
-          output.sendNoteOn(i, 52, (preset.index == i) ? 1 : 0);
+      public void onPresetLoaded(Engine.Deck deck, Preset preset) {
+        if (deck == getTargetDeck()) {
+          for (int i = 0; i < 8; ++i) {
+            output.sendNoteOn(i, 52, (preset.index == i) ? 1 : 0);
+          }
         }
       }
-      public void onPresetDirty(Preset preset) {
-        output.sendNoteOn(preset.index, 52, 2);
+      public void onPresetDirty(Engine.Deck deck, Preset preset) {
+        if (deck == getTargetDeck()) {
+          output.sendNoteOn(preset.index, 52, 2);
+        }
       }
-      public void onPresetStored(Preset preset) {
-        onPresetLoaded(preset);
+      public void onPresetStored(Engine.Deck deck, Preset preset) {
+        if (deck == getTargetDeck()) {
+          onPresetLoaded(deck, preset);
+        }
       }
       public void onPresetUnloaded() {
         for (int i = 0; i < 8; ++i) {

diff --git a/_Presets.pde b/_Presets.pde
index 1d1ca42b6340bb2ca963b2e291edf95433069376..edb4f18ba5f1785627afe230127803fa7cacdb69 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();
 }
 
@@ -38,7 +38,7 @@ class PresetManager implements LXParameter.Listener {
         public void patternDidChange(Engine.Deck deck, LXPattern pattern) {
           if (midiEngine.getFocusedDeck() == deck) {
             if (pattern != loadedPattern) {
-              onPresetDirty();
+              onPresetDirty(deck);
             }
           }
         }
@@ -60,11 +60,20 @@ 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(Engine.Deck deck, int index) {
@@ -74,12 +83,12 @@ class PresetManager implements LXParameter.Listener {
   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(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 +97,7 @@ class PresetManager implements LXParameter.Listener {
       }
     }
     for (PresetListener listener : listeners) {
-      listener.onPresetLoaded(preset);
+      listener.onPresetLoaded(deck, preset);
     }
     loadedPreset = preset;
     loadedPattern = pattern;
@@ -97,16 +106,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() {
@@ -207,7 +216,7 @@ class Preset {
         if (pattern instanceof DPat) {
           ((DPat)pattern).updateLights();
         }
-        manager.onPresetLoaded(this, pattern);
+        manager.onPresetLoaded(deck, this, pattern);
         break;
       }
     }