fixed bug where all Lite mk2 fx are shifted by 1 when loading a preset

Author: Diyan391

lib/bluetooth/devices/presets/MightyMk2Preset.dart

@@ -12,6 +12,7 @@ import 'package:mighty_plug_manager/bluetooth/devices/presets/preset_constants.d
 
 import '../NuxConstants.dart';
 import '../NuxDevice.dart';
+import '../NuxFXID.dart';
 import '../NuxMightyLiteMk2.dart';
 import '../communication/plugProCommunication.dart';
 import '../effects/Processor.dart';
@@ -349,6 +350,18 @@ class MightyMk2Preset extends Preset {
     super.setSelectedEffectForSlot(slot, index, notifyBT);
   }
 
+  @override
+  int getEffectArrayIndexFromNuxIndex(NuxFXID fxid, int nuxIndex) {
+    List<Processor> list = [];
+    list = getEffectsForSlot(fxid.value);
+
+    for (int i = 0; i < list.length; i++) {
+      if (list[i].nuxIndex == nuxIndex) return i;
+    }
+
+    return 0;
+  }
+
   @override
   Color effectColor(int index) {
     return device.processorList[index].color;
@@ -359,11 +372,6 @@ class MightyMk2Preset extends Preset {
     version = LiteMK2Version.values[ver];
   }
 
-  @override
-  String getAmpNameByNuxIndex(int index, int version) {
-    return amplifierList[index].name;
-  }
-
   @override
   void setVolume(double vol, bool btTransmit) {
     _volume = vol;

lib/bluetooth/devices/presets/PlugProPreset.dart

@@ -442,49 +442,15 @@ class PlugProPreset extends Preset {
   @override
   int getEffectArrayIndexFromNuxIndex(NuxFXID fxid, int nuxIndex) {
     List<Processor> list = [];
-    switch (fxid.value) {
-      case PresetDataIndexPlugPro.Head_iWAH:
-        return 0;
-      case PresetDataIndexPlugPro.Head_iNG:
-        return 0;
-      case PresetDataIndexPlugPro.Head_iCMP:
-        list = _compressorList;
-        break;
-      case PresetDataIndexPlugPro.Head_iEFX:
-        list = efxList;
-        break;
-      case PresetDataIndexPlugPro.Head_iAMP:
-        list = amplifierList;
-        break;
-      case PresetDataIndexPlugPro.Head_iCAB:
-        list = cabinetList;
-        break;
-      case PresetDataIndexPlugPro.Head_iMOD:
-        list = modulationList;
-        break;
-      case PresetDataIndexPlugPro.Head_iEQ:
-        list = eqList;
-        break;
-      case PresetDataIndexPlugPro.Head_iDLY:
-        list = delayList;
-        break;
-      case PresetDataIndexPlugPro.Head_iRVB:
-        list = _reverbList;
-        break;
-    }
+    list = _getEffectsForFXID(fxid);
+
     for (int i = 0; i < list.length; i++) {
       if (list[i].nuxIndex == nuxIndex) return i;
     }
 
     return 0;
   }
 
-  @override
-  String getAmpNameByNuxIndex(int index, int version) {
-    index = getEffectArrayIndexFromNuxIndex(PlugProFXID.amp, index);
-    return amplifierList[index].name;
-  }
-
   @override
   Color effectColor(int index) {
     var fxid = getFXIDFromSlot(index);

lib/bluetooth/devices/presets/Preset.dart

@@ -39,7 +39,7 @@ abstract class Preset {
   //returns whether the specific slot is on or off
   bool slotEnabled(int index);
 
-  //used for reorderable fx chain
+  //override in reorderable fx chain
   NuxFXID getFXIDFromSlot(int slot) {
     return NuxFXID.fromInt(slot);
   }
@@ -130,6 +130,7 @@ abstract class Preset {
     }
   }
 
+  //override in more complex FX chains
   int getEffectArrayIndexFromNuxIndex(NuxFXID fxid, int nuxIndex) {
     return nuxIndex;
   }
@@ -197,8 +198,8 @@ abstract class Preset {
   }
 
   String getAmpNameByNuxIndex(int index, int version) {
-    var ampIndex = NuxFXID.fromInt(device.amplifierSlotIndex);
-    getEffectArrayIndexFromNuxIndex(ampIndex, index);
+    var ampIndex = getFXIDFromSlot(device.amplifierSlotIndex);
+    index = getEffectArrayIndexFromNuxIndex(ampIndex, index);
     return amplifierList[index].name;
   }