Also update avs when state is Armed

We need to update the avs from avsHistory in two cases :
* we just looped, which means currentIndex == minIndex
* we moved the cursor manually and called setCurrentIndex, which means we are in Armed state

Author: josephlarralde

src/include/impl/SequencePerformer.h

@@ -87,6 +87,12 @@ class SequencePerformer : public AbstractPerformer {
     }
   }
 
+  void prepareLocalState() {
+    createAvsHistoryFromScore();
+    setLoopIndices(0, (score.size() == 0) ? 0 : (score.size() - 1));
+    setCurrentIndex(0);
+  }
+
   void mergeAvsStates(
     std::map<noteKey, std::uint8_t>& target,
     const std::map<noteKey, std::uint8_t> source
@@ -138,22 +144,22 @@ class SequencePerformer : public AbstractPerformer {
       return res; // will be empty if currentIndex == score.size()
     }
 
-    // set to Playing after call to getNextIndex which checks currentState value
-    if (currentState == State::Armed) {
-      currentState = State::Playing;
-    }
-
     auto activeNotes = avs.getTriggerCountMap();
 
     // if we are about to play first event in loop, we set avs to take upcoming
     // note offs from unplayed note ons into account
-    if (currentIndex == minIndex) {
+    if (currentIndex == minIndex || currentState == State::Armed) {
       // merge avs state snapshot with current avs state
       auto avsState = avsHistory[currentIndex];
       mergeAvsStates(avsState, activeNotes);
       avs.setTriggerCountMap(avsState);
     }
 
+    // set to Playing after call to getNextIndex which checks currentState value
+    if (currentState == State::Armed) {
+      currentState = State::Playing;
+    }
+
     // if we are getting the last set pair, we might have some pending endings
     // so we make sure to end them all in ending set
     if (currentIndex == maxIndex) {
@@ -173,12 +179,6 @@ class SequencePerformer : public AbstractPerformer {
     return res;
   }
 
-  void prepareLocalState(){
-    createAvsHistoryFromScore();
-    setLoopIndices(0, (score.size() == 0) ? 0 : (score.size() - 1));
-    setCurrentIndex(0);
-  }
-
 public:
   SequencePerformer() :
   AbstractPerformer(), score(Chronology<noteData, std::vector>()),