From 341783a44557bee23ffcab6cb1ce3fde7c5f029d Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Thu, 5 Jul 2018 11:08:39 +0100
Subject: [PATCH] Changed AudioProcessorGraph::NodeID from a typedef to a
 strong type to avoid accidental casts happening

---
 .../processors/juce_AudioProcessorGraph.cpp   | 35 +++++++++----------
 .../processors/juce_AudioProcessorGraph.h     | 12 ++++++-
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp
index d799ff05c6..20c262ae12 100644
--- a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp
+++ b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp
@@ -359,23 +359,20 @@ struct RenderSequenceBuilder
     {
         AudioProcessorGraph::NodeAndChannel channel;
 
-        static AssignedBuffer createReadOnlyEmpty() noexcept    { return { { (NodeID) zeroNodeID, 0 } }; }
-        static AssignedBuffer createFree() noexcept             { return { { (NodeID) freeNodeID, 0 } }; }
+        static AssignedBuffer createReadOnlyEmpty() noexcept    { return { { zeroNodeID(), 0 } }; }
+        static AssignedBuffer createFree() noexcept             { return { { freeNodeID(), 0 } }; }
 
-        bool isReadOnlyEmpty() const noexcept                   { return channel.nodeID == (NodeID) zeroNodeID; }
-        bool isFree() const noexcept                            { return channel.nodeID == (NodeID) freeNodeID; }
+        bool isReadOnlyEmpty() const noexcept                   { return channel.nodeID == zeroNodeID(); }
+        bool isFree() const noexcept                            { return channel.nodeID == freeNodeID(); }
         bool isAssigned() const noexcept                        { return ! (isReadOnlyEmpty() || isFree()); }
 
-        void setFree() noexcept                                 { channel = { (NodeID) freeNodeID, 0 }; }
-        void setAssignedToNonExistentNode() noexcept            { channel = { (NodeID) anonNodeID, 0 }; }
+        void setFree() noexcept                                 { channel = { freeNodeID(), 0 }; }
+        void setAssignedToNonExistentNode() noexcept            { channel = { anonNodeID(), 0 }; }
 
     private:
-        enum
-        {
-            anonNodeID = 0x7ffffffd,
-            zeroNodeID = 0x7ffffffe,
-            freeNodeID = 0x7fffffff
-        };
+        static constexpr NodeID anonNodeID() { return NodeID (0x7ffffffd); }
+        static constexpr NodeID zeroNodeID() { return NodeID (0x7ffffffe); }
+        static constexpr NodeID freeNodeID() { return NodeID (0x7fffffff); }
     };
 
     Array<AssignedBuffer> audioBuffers, midiBuffers;
@@ -388,12 +385,12 @@ struct RenderSequenceBuilder
         int delay;
     };
 
-    HashMap<NodeID, int> delays;
+    HashMap<uint32, int> delays;
     int totalLatency = 0;
 
     int getNodeDelay (NodeID nodeID) const noexcept
     {
-        return delays[nodeID];
+        return delays[nodeID.uid];
     }
 
     int getInputLatencyForNode (NodeID nodeID) const
@@ -402,7 +399,7 @@ struct RenderSequenceBuilder
 
         for (auto&& c : graph.getConnections())
             if (c.destination.nodeID == nodeID)
-                maxLatency = jmax (maxLatency, getNodeDelay (c.source.nodeID));
+                maxLatency = jmax (maxLatency, getNodeDelay (c.source.nodeID.uid));
 
         return maxLatency;
     }
@@ -681,7 +678,7 @@ struct RenderSequenceBuilder
         if (processor.producesMidi())
             midiBuffers.getReference (midiBufferToUse).channel = { node.nodeID, AudioProcessorGraph::midiChannelIndex };
 
-        delays.set (node.nodeID, maxLatency + processor.getLatencySamples());
+        delays.set (node.nodeID.uid, maxLatency + processor.getLatencySamples());
 
         if (numOuts == 0)
             totalLatency = maxLatency;
@@ -920,8 +917,8 @@ AudioProcessorGraph::Node::Ptr AudioProcessorGraph::addNode (AudioProcessor* new
         return {};
     }
 
-    if (nodeID == 0)
-        nodeID = ++lastNodeID;
+    if (nodeID == NodeID())
+        nodeID.uid = ++(lastNodeID.uid);
 
     for (auto* n : nodes)
     {
@@ -932,7 +929,7 @@ AudioProcessorGraph::Node::Ptr AudioProcessorGraph::addNode (AudioProcessor* new
         }
     }
 
-    if (nodeID > lastNodeID)
+    if (lastNodeID < nodeID)
         lastNodeID = nodeID;
 
     newProcessor->setPlayHead (getPlayHead());
diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h
index b82c223cb8..b5909efcc9 100644
--- a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h
+++ b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.h
@@ -58,7 +58,17 @@ public:
     ~AudioProcessorGraph();
 
     /** Each node in the graph has a UID of this type. */
-    using NodeID = uint32;
+    struct NodeID
+    {
+        constexpr NodeID() {}
+        constexpr NodeID (uint32 i) : uid (i) {}
+
+        uint32 uid = 0;
+
+        bool operator== (const NodeID& other) const noexcept    { return uid == other.uid; }
+        bool operator!= (const NodeID& other) const noexcept    { return uid != other.uid; }
+        bool operator<  (const NodeID& other) const noexcept    { return uid <  other.uid; }
+    };
 
     //==============================================================================
     /** A special index that represents the midi channel of a node.