ValueTree: Optimise when listeners don't remove themselves

sysfce2 · Jun 7, 2024 · 315167a · 315167a
1 parent a469daf
commit 315167a
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/modules/juce_data_structures/values/juce_ValueTree.cpp b/modules/juce_data_structures/values/juce_ValueTree.cpp
@@ -76,23 +76,21 @@ class ValueTree::SharedObject final : public ReferenceCountedObject
  template <typename Function>
  void callListeners (ValueTree::Listener* listenerToExclude, Function fn) const
  {
- auto numListeners = valueTreesWithListeners.size();
+ if (valueTreesWithListeners.size() == 0)
+ return;
 
- if (numListeners == 1)
+ if (valueTreesWithListeners.size() == 1)
  {
  valueTreesWithListeners.getUnchecked (0)->listeners.callExcluding (listenerToExclude, fn);
+ return;
  }
- else if (numListeners > 0)
- {
- auto listenersCopy = valueTreesWithListeners;
 
- for (int i = 0; i < numListeners; ++i)
- {
- auto* v = listenersCopy.getUnchecked (i);
+ const auto listenersCopy = valueTreesWithListeners;
 
- if (i == 0 || valueTreesWithListeners.contains (v))
- v->listeners.callExcluding (listenerToExclude, fn);
- }
+ for (auto [i, v] : enumerate (listenersCopy, int{}))
+ {
+ if (valueTreesWithListeners[i] == v || valueTreesWithListeners.contains (v))
+ v->listeners.callExcluding (listenerToExclude, fn);
  }
  }