Stop node monitors when node disconnected

ideoforms · Jan 21, 2024 · f9cb5dc · f9cb5dc
1 parent cc27f47
commit f9cb5dc
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/source/include/signalflow/core/graph.h b/source/include/signalflow/core/graph.h
@@ -41,6 +41,7 @@ class AudioGraph
 
     /**--------------------------------------------------------------------------------
      * Remove all nodes from the graph.
+     * Also removes NodeMonitors.
      *
      **--------------------------------------------------------------------------------*/
     void clear();

diff --git a/source/include/signalflow/node/node-monitor.h b/source/include/signalflow/node/node-monitor.h
@@ -21,7 +21,7 @@ class NodeMonitor
      * @param label The label to use when printing the output
      * @param frequency How often to print, in seconds
      *-----------------------------------------------------------------------*/
-    NodeMonitor(NodeRef node, std::string label, float frequency);
+    NodeMonitor(Node *node, std::string label, float frequency);
 
     /**------------------------------------------------------------------------
      * Start monitoring.
@@ -37,7 +37,7 @@ class NodeMonitor
 
 private:
     void run_thread();
-    NodeRef node;
+    Node *node;
     float frequency;
     bool running;
     std::string label;

diff --git a/source/src/core/graph.cpp b/source/src/core/graph.cpp
@@ -298,6 +298,11 @@ void AudioGraph::reset_graph()
      *--------------------------------------------------------------------------------*/
     for (auto node : nodes_to_remove)
     {
+        /*--------------------------------------------------------------------------------
+         * Stop any monitoring running on the node.
+         *--------------------------------------------------------------------------------*/
+        node->poll(0);
+
         while (node->outputs.size() > 0)
         {
             auto output = *(node->outputs.begin());

diff --git a/source/src/node/node-monitor.cpp b/source/src/node/node-monitor.cpp
@@ -3,7 +3,7 @@
 namespace signalflow
 {
 
-NodeMonitor::NodeMonitor(NodeRef node, std::string label, float frequency)
+NodeMonitor::NodeMonitor(Node *node, std::string label, float frequency)
     : node(node), frequency(frequency), label(label)
 {
     if (label == "")

diff --git a/source/src/node/node.cpp b/source/src/node/node.cpp
@@ -66,6 +66,10 @@ Node::Node()
 
 Node::~Node()
 {
+    if (this->monitor)
+    {
+        this->monitor->stop();
+    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////