Make connection management private to base class

Author: meshula

src/LabSoundInterface.cpp

@@ -13,7 +13,6 @@ using std::unique_ptr;
 using std::string;
 using std::vector;
 
-
 struct NodeReverseLookup
 {
     map<string, ln_Pin> input_pin_map;
@@ -22,11 +21,8 @@ struct NodeReverseLookup
 };
 
 map<ln_Node, NodeReverseLookup, cmp_ln_Node> g_node_reverse_lookups;
-
 unique_ptr<lab::AudioContext> g_audio_context;
 
-
-
 // Returns input, output
 inline std::pair<lab::AudioStreamConfig, lab::AudioStreamConfig> GetDefaultAudioDeviceConfiguration(const bool with_input = false)
 {
@@ -353,14 +349,14 @@ void LabSoundProvider::connect_bus_out_to_param_in(ln_Node output_node_id, ln_Pi
 // override
 void LabSoundProvider::disconnect(ln_Connection connection_id_)
 {
-    auto conn = _connections.find(connection_id_);
-    if (conn == _connections.end())
+    lab::noodle::NoodleConnection const* const conn = find_connection(connection_id_);
+    if (!conn)
         return;
 
-    ln_Node input_node_id = copy(conn->second.node_to);
-    ln_Node output_node_id = copy(conn->second.node_from);
-    ln_Pin input_pin = copy(conn->second.pin_to);
-    ln_Pin output_pin = copy(conn->second.pin_from);
+    ln_Node input_node_id = copy(conn->node_to);
+    ln_Node output_node_id = copy(conn->node_from);
+    ln_Pin input_pin = copy(conn->pin_to);
+    ln_Pin output_pin = copy(conn->pin_from);
     if (input_node_id.valid && output_node_id.valid && input_pin.valid && output_pin.valid)
     {
         auto in_it = _audioNodes.find(input_node_id);
@@ -399,10 +395,6 @@ void LabSoundProvider::disconnect(ln_Connection connection_id_)
             }
         }
     }
-
-    //// @TODO this plumbing belongs in lab_noodle as it is audio-agnostic
-    _connections.erase(conn);
-    /// @TODO end
     return;
 }
 
@@ -660,18 +652,6 @@ void LabSoundProvider::node_delete(ln_Node node_id)
                 ++i;
             }
         }
-
-        //// @TODO this plumbing belongs in lab_noodle as it is audio-agnostic
-        // remove connections
-
-        for (auto i = _connections.begin(), last = _connections.end(); i != last; ) {
-            if (i->second.node_from.id == node_id.id || i->second.node_to.id == node_id.id) {
-                i = _connections.erase(i);
-            }
-            else {
-                ++i;
-            }
-        }
         /// @TODO end plumbing
 
         auto reverse_it = g_node_reverse_lookups.find(node_id);

src/lab_noodle.cpp

@@ -20,7 +20,6 @@
 namespace lab {
 namespace noodle {
 
-
     using namespace ImGui;
 
     static const ImColor node_background_fill = ImColor(10, 20, 30, 128);
@@ -293,6 +292,17 @@ namespace noodle {
 
         }
 
+        void delete_connections(ln_Node id) {
+            for (auto i = provider._connections.begin(), last = provider._connections.end(); i != last; ) {
+                if (i->second.node_from.id == id.id || i->second.node_to.id == id.id) {
+                    i = provider._connections.erase(i);
+                }
+                else {
+                    ++i;
+                }
+            }
+        }
+
         void eval(EditState& edit)
         {
             switch (type)
@@ -540,7 +550,13 @@ namespace noodle {
 
             case WorkType::DisconnectInFromOut:
             {
-                provider.disconnect(ln_Connection{connection_id});
+                auto id = ln_Connection{ connection_id };
+                auto conn_it = provider._connections.find(id);
+                if (conn_it != provider._connections.end())
+                {
+                    provider.disconnect(id);
+                    provider._connections.erase(conn_it);
+                }
                 edit.incr_work_epoch();
                 break;
             }
@@ -556,6 +572,7 @@ namespace noodle {
                     for (auto en : cn.nodes)
                     {
                         provider.node_delete(en);
+                        delete_connections(en);
                     }
                     cn.nodes.clear();
                 }
@@ -569,6 +586,7 @@ namespace noodle {
                             gnl->second.parent_canvas->nodes.erase(it);
                     }
                     provider.node_delete(input_node);
+                    delete_connections(input_node);
                 }
 
                 if (gnl != provider._nodeGraphics.end())
@@ -620,6 +638,7 @@ namespace noodle {
                     }
                 }
 
+                provider._connections.clear();
                 provider._noodleNodes.clear();
                 provider._nodeGraphics.clear();
                 provider._pinGraphics.clear();

src/lab_noodle.h

@@ -198,19 +198,28 @@ namespace lab { namespace noodle {
     {
         friend struct Work;
         friend struct ProviderHarness;
+        friend struct EditState;
         std::map<std::string, ln_Node> _name_to_entity;
+        std::map<ln_Connection, NoodleConnection, cmp_ln_Connection> _connections;
 
     public:
 
+        virtual ~Provider() = default;
+
         std::map<ln_Node, CanvasGroup, cmp_ln_Node> _canvasNodes;
         std::map<ln_Node, NoodleNode, cmp_ln_Node> _noodleNodes;
         std::map<ln_Node, NoodleNodeGraphic, cmp_ln_Node> _nodeGraphics;
-        std::map<ln_Connection, NoodleConnection, cmp_ln_Connection> _connections;
         std::map<ln_Pin, NoodlePin, cmp_ln_Pin> _noodlePins;
         std::map<ln_Pin, NoodlePinGraphic, cmp_ln_Pin> _pinGraphics;
 
-        virtual ~Provider() = default;
-        
+        NoodleConnection const* const find_connection(ln_Connection c) {
+            auto it = _connections.find(c);
+            if (it == _connections.end())
+                return nullptr;
+            return &it->second;
+        }
+
+
         inline ln_Node copy(ln_Node n)
         {
             return n;