Rolled back temp changes

Author: dikadk

modules/tracktion_engine/midi/tracktion_ActiveNoteList.h

@@ -13,128 +13,47 @@ namespace tracktion { inline namespace engine
 
 struct ActiveNoteList
 {
-    struct NoteState
-    {
-        juce::uint16 activeNotes = 0;
-        juce::uint16 pendingOns = 0;
-        juce::uint16 pendingOffs = 0;
-    };
-    
-    NoteState noteStates[128] = {};
+    juce::uint16 activeChannels[128] = {};
 
     void reset() noexcept
     {
-        std::memset (noteStates, 0, sizeof (noteStates));
-    }
-
-    void clearPendingEvents() noexcept
-    {
-        for (auto& state : noteStates)
-        {
-            state.pendingOns = 0;
-            state.pendingOffs = 0;
-        }
+        std::memset (activeChannels, 0, sizeof (activeChannels));
     }
 
     bool isNoteActive (int channel, int note) const noexcept
     {
         return isValidIndex (channel, note)
-                && (noteStates[note].activeNotes & (1u << (channel - 1))) != 0;
-    }
-
-    bool hasPendingNoteOn (int channel, int note) const noexcept
-    {
-        return isValidIndex (channel, note)
-                && (noteStates[note].pendingOns & (1u << (channel - 1))) != 0;
-    }
-
-    bool hasPendingNoteOff (int channel, int note) const noexcept
-    {
-        return isValidIndex (channel, note)
-                && (noteStates[note].pendingOffs & (1u << (channel - 1))) != 0;
+                && (activeChannels[note] & (1u << (channel - 1))) != 0;
     }
 
     void startNote (int channel, int note) noexcept
     {
         if (isValidIndex (channel, note))
-            noteStates[note].activeNotes |= (1u << (channel - 1));
+            activeChannels[note] |= (1u << (channel - 1));
     }
 
     void clearNote (int channel, int note) noexcept
     {
         if (isValidIndex (channel, note))
-            noteStates[note].activeNotes &= ~(1u << (channel - 1));
-    }
-
-    void addPendingNoteOn (int channel, int note) noexcept
-    {
-        if (isValidIndex (channel, note))
-            noteStates[note].pendingOns |= (1u << (channel - 1));
-    }
-
-    void addPendingNoteOff (int channel, int note) noexcept
-    {
-        if (isValidIndex (channel, note))
-            noteStates[note].pendingOffs |= (1u << (channel - 1));
-    }
-
-    void applyPendingEvents() noexcept
-    {
-        for (auto& state : noteStates)
-        {
-            // Apply pending note-offs first
-            state.activeNotes &= ~state.pendingOffs;
-            
-            // Then apply pending note-ons
-            state.activeNotes |= state.pendingOns;
-
-            state.pendingOns = 0;
-            state.pendingOffs = 0;
-        }
+            activeChannels[note] &= ~(1u << (channel - 1));
     }
 
     bool areAnyNotesActive() const noexcept
     {
-        for (const auto& state : noteStates)
-            if (state.activeNotes > 0)
-                return true;
-
-        return false;
-    }
+        juce::uint16 result = 0;
 
-    bool areAnyEventsPending() const noexcept
-    {
-        for (const auto& state : noteStates)
-            if (state.pendingOns > 0 || state.pendingOffs > 0)
-                return true;
+        for (auto a : activeChannels)
+            result |= a;
 
-        return false;
+        return result > 0;
     }
 
     template <typename Visitor>
     void iterate (Visitor&& v) const noexcept
     {
         for (int note = 0; note < 128; ++note)
             for (int chan = 0; chan < 16; ++chan)
-                if ((noteStates[note].activeNotes & (1u << chan)) != 0)
-                    v (chan + 1, note);
-    }
-
-    template <typename Visitor>
-    void iteratePendingOns (Visitor&& v) const noexcept
-    {
-        for (int note = 0; note < 128; ++note)
-            for (int chan = 0; chan < 16; ++chan)
-                if ((noteStates[note].pendingOns & (1u << chan)) != 0)
-                    v (chan + 1, note);
-    }
-
-    template <typename Visitor>
-    void iteratePendingOffs (Visitor&& v) const noexcept
-    {
-        for (int note = 0; note < 128; ++note)
-            for (int chan = 0; chan < 16; ++chan)
-                if ((noteStates[note].pendingOffs & (1u << chan)) != 0)
+                if ((activeChannels[note] & (1u << chan)) != 0)
                     v (chan + 1, note);
     }