Call onTransitionEnd() after active

diff --git a/_Presets.pde b/_Presets.pde
index ada8bb1ba21a5f986d2dde8a05b5484e06b495a1..7743cbf3aa7c652f851938145b1595822e2bb612 100644 (file)
--- a/_Presets.pde
+++ b/_Presets.pde
@@ -4,7 +4,7 @@ interface PresetListener {
   public void onPresetStored(Preset preset);
 }
 
-class PresetManager {
+class PresetManager implements LXParameter.Listener {
   
   public static final int NUM_PRESETS = 8;
   public static final String FILENAME = "data/presets.txt";
@@ -13,7 +13,8 @@ class PresetManager {
   private final Preset[] presets = new Preset[NUM_PRESETS];
   private final List<PresetListener> listeners = new ArrayList<PresetListener>();
   
-  private LXPattern loadedPreset = null;
+  private Preset loadedPreset = null;
+  private LXPattern loadedPattern = null;
   
   PresetManager() {
     for (int i = 0; i < presets.length; ++i) {
@@ -43,12 +44,31 @@ class PresetManager {
 
   public void store(int index) {
     presets[index].store(midiEngine.getFocusedPattern());
+    select(index);
   }
   
   public void onPresetLoaded(Preset preset, LXPattern pattern) {
+    if (loadedPattern != pattern) {
+      if (loadedPattern != null) {
+        for (LXParameter p : loadedPattern.getParameters()) {
+          ((LXListenableParameter) p).removeListener(this);
+        }
+      }
+    }
     for (PresetListener listener : listeners) {
       listener.onPresetLoaded(preset);
     }
+    loadedPreset = preset;
+    loadedPattern = pattern;
+    for (LXParameter p : loadedPattern.getParameters()) {
+      ((LXListenableParameter) p).addListener(this);
+    }
+  }
+  
+  public void onParameterChanged(LXParameter p) {
+    for (PresetListener listener : listeners) {
+      listener.onPresetDirty(loadedPreset);
+    }
   }
   
   public void write() {

diff --git a/code/HeronLX.jar b/code/HeronLX.jar
index 3a649062ed8d8286fee16bf7c905114baabe34a0..de2032bc01b1c95795f10572d7aac34a11f334cd 100755 (executable)
Binary files a/code/HeronLX.jar and b/code/HeronLX.jar differ