Shared abstract Node interface.

git-svn-id: http://svn.drobilla.net/lad/ingen@835 a436a847-0d15-0410-975c-d299462d15a1

31 files changed, 58 insertions, 58 deletions

diff --git a/src/libs/engine/events/ClearPatchEvent.cpp b/src/libs/engine/events/ClearPatchEvent.cpp
index a4d5c8df..891ca53b 100644
--- a/src/libs/engine/events/ClearPatchEvent.cpp
+++ b/src/libs/engine/events/ClearPatchEvent.cpp
@@ -15,6 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <raul/Maid.hpp>
 #include "ClearPatchEvent.hpp"
 #include "Responder.hpp"
 #include "Engine.hpp"
@@ -23,8 +24,7 @@
 #include "util.hpp"
 #include "ObjectStore.hpp"
 #include "Port.hpp"
-#include <raul/Maid.hpp>
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "Connection.hpp"
 #include "QueuedEventSource.hpp"
 
@@ -85,7 +85,7 @@ ClearPatchEvent::post_process()
 {	
 	if (_patch != NULL) {
 		// Delete all nodes
-		for (Raul::List<Node*>::iterator i = _patch->nodes().begin(); i != _patch->nodes().end(); ++i) {
+		for (Raul::List<NodeImpl*>::iterator i = _patch->nodes().begin(); i != _patch->nodes().end(); ++i) {
 			(*i)->deactivate();
 			delete *i;
 		}
diff --git a/src/libs/engine/events/ConnectionEvent.cpp b/src/libs/engine/events/ConnectionEvent.cpp
index 4953eb02..d1ec1a89 100644
--- a/src/libs/engine/events/ConnectionEvent.cpp
+++ b/src/libs/engine/events/ConnectionEvent.cpp
@@ -91,8 +91,8 @@ ConnectionEvent::pre_process()
 		return;
 	}
 
-	Node* const src_node = _src_port->parent_node();
-	Node* const dst_node = _dst_port->parent_node();
+	NodeImpl* const src_node = _src_port->parent_node();
+	NodeImpl* const dst_node = _dst_port->parent_node();
 
 	// Connection to a patch port from inside the patch
 	if (src_node->parent_patch() != dst_node->parent_patch()) {
@@ -133,8 +133,8 @@ ConnectionEvent::pre_process()
 	// Need to be careful about patch port connections here and adding a node's
 	// parent as a dependant/provider, or adding a patch as it's own provider...
 	if (src_node != dst_node && src_node->parent() == dst_node->parent()) {
-		dst_node->providers()->push_back(new Raul::ListNode<Node*>(src_node));
-		src_node->dependants()->push_back(new Raul::ListNode<Node*>(dst_node));
+		dst_node->providers()->push_back(new Raul::ListNode<NodeImpl*>(src_node));
+		src_node->dependants()->push_back(new Raul::ListNode<NodeImpl*>(dst_node));
 	}
 
 	if (_patch->enabled())
diff --git a/src/libs/engine/events/ConnectionEvent.hpp b/src/libs/engine/events/ConnectionEvent.hpp
index ed2318d8..eb128660 100644
--- a/src/libs/engine/events/ConnectionEvent.hpp
+++ b/src/libs/engine/events/ConnectionEvent.hpp
@@ -32,7 +32,7 @@ namespace Raul {
 namespace Ingen {
 	
 class Patch;
-class Node;
+class NodeImpl;
 class Connection;
 class MidiMessage;
 class Port;
diff --git a/src/libs/engine/events/CreateNodeEvent.cpp b/src/libs/engine/events/CreateNodeEvent.cpp
index 6ed860dd..991ee0a8 100644
--- a/src/libs/engine/events/CreateNodeEvent.cpp
+++ b/src/libs/engine/events/CreateNodeEvent.cpp
@@ -21,7 +21,7 @@
 #include "CreateNodeEvent.hpp"
 #include "Responder.hpp"
 #include "Patch.hpp"
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "Plugin.hpp"
 #include "Engine.hpp"
 #include "Patch.hpp"
@@ -91,7 +91,7 @@ CreateNodeEvent::pre_process()
 		
 			// This can be done here because the audio thread doesn't touch the
 			// node tree - just the process order array
-			_patch->add_node(new Raul::ListNode<Node*>(_node));
+			_patch->add_node(new Raul::ListNode<NodeImpl*>(_node));
 			//_node->add_to_store(_engine.object_store());
 			_engine.object_store()->add(_node);
 			
diff --git a/src/libs/engine/events/CreateNodeEvent.hpp b/src/libs/engine/events/CreateNodeEvent.hpp
index 73cbcc02..1452df05 100644
--- a/src/libs/engine/events/CreateNodeEvent.hpp
+++ b/src/libs/engine/events/CreateNodeEvent.hpp
@@ -29,7 +29,7 @@ template<typename T> class TreeNode;
 namespace Ingen {
 
 class Patch;
-class Node;
+class NodeImpl;
 class Plugin;
 class CompiledPatch;
 
@@ -71,7 +71,7 @@ private:
 	string         _plugin_label;
 	bool           _poly;
 	Patch*         _patch;
-	Node*          _node;
+	NodeImpl*      _node;
 	CompiledPatch* _compiled_patch; ///< Patch's new process order
 	bool           _node_already_exists;
 };
diff --git a/src/libs/engine/events/CreatePatchEvent.cpp b/src/libs/engine/events/CreatePatchEvent.cpp
index 748d44dc..a7cc7f8c 100644
--- a/src/libs/engine/events/CreatePatchEvent.cpp
+++ b/src/libs/engine/events/CreatePatchEvent.cpp
@@ -20,7 +20,7 @@
 #include "CreatePatchEvent.hpp"
 #include "Responder.hpp"
 #include "Patch.hpp"
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "Plugin.hpp"
 #include "Engine.hpp"
 #include "ClientBroadcaster.hpp"
@@ -71,7 +71,7 @@ CreatePatchEvent::pre_process()
 	_patch = new Patch(_engine, _path.name(), poly, _parent, _engine.audio_driver()->sample_rate(), _engine.audio_driver()->buffer_size(), _poly);
 		
 	if (_parent != NULL) {
-		_parent->add_node(new Raul::ListNode<Node*>(_patch));
+		_parent->add_node(new Raul::ListNode<NodeImpl*>(_patch));
 
 		if (_parent->enabled())
 			_compiled_patch = _parent->compile();
diff --git a/src/libs/engine/events/CreatePatchEvent.hpp b/src/libs/engine/events/CreatePatchEvent.hpp
index 933ce066..0b614013 100644
--- a/src/libs/engine/events/CreatePatchEvent.hpp
+++ b/src/libs/engine/events/CreatePatchEvent.hpp
@@ -30,7 +30,7 @@ template<typename T> class TreeNode;
 namespace Ingen {
 	
 class Patch;
-class Node;
+class NodeImpl;
 class Plugin;
 class CompiledPatch;
 
diff --git a/src/libs/engine/events/DSSIConfigureEvent.cpp b/src/libs/engine/events/DSSIConfigureEvent.cpp
index a1588bed..631ee608 100644
--- a/src/libs/engine/events/DSSIConfigureEvent.cpp
+++ b/src/libs/engine/events/DSSIConfigureEvent.cpp
@@ -17,7 +17,7 @@
 
 #include "DSSIConfigureEvent.hpp"
 #include "Engine.hpp"
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "ClientBroadcaster.hpp"
 #include "Plugin.hpp"
 #include "ObjectStore.hpp"
@@ -38,7 +38,7 @@ DSSIConfigureEvent::DSSIConfigureEvent(Engine& engine, SharedPtr<Responder> resp
 void
 DSSIConfigureEvent::pre_process()
 {
-	Node* node = _engine.object_store()->find_node(_node_path);
+	NodeImpl* node = _engine.object_store()->find_node(_node_path);
 
 	if (node != NULL && node->plugin()->type() == Plugin::DSSI) {
 		_node = (DSSINode*)node;
diff --git a/src/libs/engine/events/DSSIControlEvent.cpp b/src/libs/engine/events/DSSIControlEvent.cpp
index 648ec05a..25bcaaf4 100644
--- a/src/libs/engine/events/DSSIControlEvent.cpp
+++ b/src/libs/engine/events/DSSIControlEvent.cpp
@@ -17,7 +17,7 @@
 
 #include "DSSIControlEvent.hpp"
 #include "Engine.hpp"
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "Plugin.hpp"
 #include "ObjectStore.hpp"
 
@@ -37,7 +37,7 @@ DSSIControlEvent::DSSIControlEvent(Engine& engine, SharedPtr<Responder> responde
 void
 DSSIControlEvent::pre_process()
 {
-	Node* node = _engine.object_store()->find_node(_node_path);
+	NodeImpl* node = _engine.object_store()->find_node(_node_path);
 
 	if (node->plugin()->type() != Plugin::DSSI)
 		_node = NULL;
diff --git a/src/libs/engine/events/DSSIProgramEvent.cpp b/src/libs/engine/events/DSSIProgramEvent.cpp
index d791e484..d47e3294 100644
--- a/src/libs/engine/events/DSSIProgramEvent.cpp
+++ b/src/libs/engine/events/DSSIProgramEvent.cpp
@@ -19,7 +19,7 @@
 #include <cstdio>
 #include <iostream>
 #include "Engine.hpp"
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "ClientBroadcaster.hpp"
 #include "Plugin.hpp"
 #include "ObjectStore.hpp"
@@ -42,7 +42,7 @@ DSSIProgramEvent::DSSIProgramEvent(Engine& engine, SharedPtr<Responder> responde
 void
 DSSIProgramEvent::pre_process()
 {
-	Node* node = _engine.object_store()->find_node(_node_path);
+	NodeImpl* node = _engine.object_store()->find_node(_node_path);
 
 	if (node != NULL && node->plugin()->type() == Plugin::DSSI)
 		_node = (DSSINode*)node;
diff --git a/src/libs/engine/events/DSSIUpdateEvent.cpp b/src/libs/engine/events/DSSIUpdateEvent.cpp
index 807cedad..61d2ab97 100644
--- a/src/libs/engine/events/DSSIUpdateEvent.cpp
+++ b/src/libs/engine/events/DSSIUpdateEvent.cpp
@@ -17,7 +17,7 @@
 
 #include "DSSIUpdateEvent.hpp"
 #include <iostream>
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "ObjectStore.hpp"
 #include "Engine.hpp"
 #include "DSSINode.hpp"
@@ -40,7 +40,7 @@ DSSIUpdateEvent::DSSIUpdateEvent(Engine& engine, SharedPtr<Responder> responder,
 void
 DSSIUpdateEvent::pre_process()
 {
-	Node* node = _engine.object_store()->find_node(_path);
+	NodeImpl* node = _engine.object_store()->find_node(_path);
 
 	if (node == NULL || node->plugin()->type() != Plugin::DSSI) {
 		_node = NULL;
diff --git a/src/libs/engine/events/DestroyEvent.cpp b/src/libs/engine/events/DestroyEvent.cpp
index 2ccad693..96d8874a 100644
--- a/src/libs/engine/events/DestroyEvent.cpp
+++ b/src/libs/engine/events/DestroyEvent.cpp
@@ -67,7 +67,7 @@ DestroyEvent::pre_process()
 	_store_iterator = _engine.object_store()->find(_path);
 
 	if (_store_iterator != _engine.object_store()->objects().end())  {
-		_node = dynamic_cast<Node*>(_store_iterator->second);
+		_node = dynamic_cast<NodeImpl*>(_store_iterator->second);
 
 		if (!_node)
 			_port = dynamic_cast<Port*>(_store_iterator->second);
diff --git a/src/libs/engine/events/DestroyEvent.hpp b/src/libs/engine/events/DestroyEvent.hpp
index 77167598..78ff3d7b 100644
--- a/src/libs/engine/events/DestroyEvent.hpp
+++ b/src/libs/engine/events/DestroyEvent.hpp
@@ -35,7 +35,7 @@ namespace Ingen {
 
 class GraphObjectImpl;
 class Patch;
-class Node;
+class NodeImpl;
 class Port;
 class DriverPort;
 class Plugin;
@@ -62,10 +62,10 @@ private:
 	Path                           _path;
 	ObjectStore::Objects::iterator _store_iterator;
 	Table<Path,GraphObjectImpl*>   _removed_table;
-	Node*                          _node;  ///< Same as _object if it is a Node, otherwise NULL
+	NodeImpl*                      _node;  ///< Same as _object if it is a Node, otherwise NULL
 	Port*                          _port;  ///< Same as _object if it is a Port, otherwise NULL
 	DriverPort*                    _driver_port;
-	Raul::ListNode<Node*>*         _patch_node_listnode;
+	Raul::ListNode<NodeImpl*>*     _patch_node_listnode;
 	Raul::ListNode<Port*>*         _patch_port_listnode;
 	Raul::Array<Port*>*            _ports_array; ///< New (external) ports array for Patch
 	CompiledPatch*                 _compiled_patch;  ///< Patch's new process order
diff --git a/src/libs/engine/events/DisconnectNodeEvent.cpp b/src/libs/engine/events/DisconnectNodeEvent.cpp
index 26f31549..3ee93b81 100644
--- a/src/libs/engine/events/DisconnectNodeEvent.cpp
+++ b/src/libs/engine/events/DisconnectNodeEvent.cpp
@@ -25,7 +25,7 @@
 #include "DisconnectionEvent.hpp"
 #include "Engine.hpp"
 #include "InputPort.hpp"
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "ObjectStore.hpp"
 #include "OutputPort.hpp"
 #include "Patch.hpp"
@@ -49,7 +49,7 @@ DisconnectNodeEvent::DisconnectNodeEvent(Engine& engine, SharedPtr<Responder> re
 
 /** Internal version, disconnects parent port as well (in the case of InputNode, etc).
  */
-DisconnectNodeEvent::DisconnectNodeEvent(Engine& engine, Node* node)
+DisconnectNodeEvent::DisconnectNodeEvent(Engine& engine, NodeImpl* node)
 : QueuedEvent(engine),
   _node_path(node->path()),
   _patch(node->parent_patch()),
diff --git a/src/libs/engine/events/DisconnectNodeEvent.hpp b/src/libs/engine/events/DisconnectNodeEvent.hpp
index 616f321f..5decb923 100644
--- a/src/libs/engine/events/DisconnectNodeEvent.hpp
+++ b/src/libs/engine/events/DisconnectNodeEvent.hpp
@@ -29,7 +29,7 @@ namespace Ingen {
 
 class DisconnectionEvent;
 class Patch;
-class Node;
+class NodeImpl;
 class Connection;
 class Port;
 class InputPort;
@@ -44,7 +44,7 @@ class DisconnectNodeEvent : public QueuedEvent
 {
 public:
 	DisconnectNodeEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const string& node_path);
-	DisconnectNodeEvent(Engine& engine, Node* node);
+	DisconnectNodeEvent(Engine& engine, NodeImpl* node);
 	~DisconnectNodeEvent();
 
 	void pre_process();
@@ -54,7 +54,7 @@ public:
 private:
 	Raul::Path                      _node_path;
 	Patch*                          _patch;
-	Node*                           _node;
+	NodeImpl*                       _node;
 	Raul::List<DisconnectionEvent*> _disconnection_events;
 	
 	bool _succeeded;
diff --git a/src/libs/engine/events/DisconnectPortEvent.cpp b/src/libs/engine/events/DisconnectPortEvent.cpp
index 5056877d..6ed328cf 100644
--- a/src/libs/engine/events/DisconnectPortEvent.cpp
+++ b/src/libs/engine/events/DisconnectPortEvent.cpp
@@ -22,7 +22,7 @@
 #include <raul/Array.hpp>
 #include "Responder.hpp"
 #include "Engine.hpp"
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "Connection.hpp"
 #include "DisconnectionEvent.hpp"
 #include "Port.hpp"
diff --git a/src/libs/engine/events/DisconnectPortEvent.hpp b/src/libs/engine/events/DisconnectPortEvent.hpp
index a58dc612..85c37ed3 100644
--- a/src/libs/engine/events/DisconnectPortEvent.hpp
+++ b/src/libs/engine/events/DisconnectPortEvent.hpp
@@ -29,7 +29,7 @@ namespace Ingen {
 
 	
 class Patch;
-class Node;
+class NodeImpl;
 class Connection;
 class Port;
 class DisconnectionEvent;
@@ -58,7 +58,7 @@ private:
 	Port*                     _port;
 	Raul::List<DisconnectionEvent*> _disconnection_events;
 	
-	Raul::Array<Node*>* _process_order; // Patch's new process order
+	Raul::Array<NodeImpl*>* _process_order; // Patch's new process order
 	
 	bool _succeeded;
 	bool _lookup;
diff --git a/src/libs/engine/events/DisconnectionEvent.cpp b/src/libs/engine/events/DisconnectionEvent.cpp
index da91c147..33dbdeeb 100644
--- a/src/libs/engine/events/DisconnectionEvent.cpp
+++ b/src/libs/engine/events/DisconnectionEvent.cpp
@@ -103,8 +103,8 @@ DisconnectionEvent::pre_process()
 		return;
 	}
 	
-	Node* const src_node = _src_port->parent_node();
-	Node* const dst_node = _dst_port->parent_node();
+	NodeImpl* const src_node = _src_port->parent_node();
+	NodeImpl* const dst_node = _dst_port->parent_node();
 
 	// Connection to a patch port from inside the patch
 	if (src_node->parent_patch() != dst_node->parent_patch()) {
@@ -132,13 +132,13 @@ DisconnectionEvent::pre_process()
 		return;
 	}
 	
-	for (Raul::List<Node*>::iterator i = dst_node->providers()->begin(); i != dst_node->providers()->end(); ++i)
+	for (Raul::List<NodeImpl*>::iterator i = dst_node->providers()->begin(); i != dst_node->providers()->end(); ++i)
 		if ((*i) == src_node) {
 			delete dst_node->providers()->erase(i);
 			break;
 		}
 
-	for (Raul::List<Node*>::iterator i = src_node->dependants()->begin(); i != src_node->dependants()->end(); ++i)
+	for (Raul::List<NodeImpl*>::iterator i = src_node->dependants()->begin(); i != src_node->dependants()->end(); ++i)
 		if ((*i) == dst_node) {
 			delete src_node->dependants()->erase(i);
 			break;
diff --git a/src/libs/engine/events/DisconnectionEvent.hpp b/src/libs/engine/events/DisconnectionEvent.hpp
index cefcb17b..46b2c015 100644
--- a/src/libs/engine/events/DisconnectionEvent.hpp
+++ b/src/libs/engine/events/DisconnectionEvent.hpp
@@ -32,7 +32,7 @@ namespace Raul {
 namespace Ingen {
 	
 class Patch;
-class Node;
+class NodeImpl;
 class Connection;
 class MidiMessage;
 class Port;
diff --git a/src/libs/engine/events/EnablePatchEvent.hpp b/src/libs/engine/events/EnablePatchEvent.hpp
index a5d7d7e7..fa36aae4 100644
--- a/src/libs/engine/events/EnablePatchEvent.hpp
+++ b/src/libs/engine/events/EnablePatchEvent.hpp
@@ -28,7 +28,7 @@ namespace Raul { template <typename T> class Array; }
 namespace Ingen {
 
 class Patch;
-class Node;
+class NodeImpl;
 class CompiledPatch;
 
 
diff --git a/src/libs/engine/events/MidiLearnEvent.cpp b/src/libs/engine/events/MidiLearnEvent.cpp
index 66f0ae2f..683c879a 100644
--- a/src/libs/engine/events/MidiLearnEvent.cpp
+++ b/src/libs/engine/events/MidiLearnEvent.cpp
@@ -19,7 +19,7 @@
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "ObjectStore.hpp"
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "MidiControlNode.hpp"
 #include "ClientBroadcaster.hpp"
 #include "Plugin.hpp"
diff --git a/src/libs/engine/events/MidiLearnEvent.hpp b/src/libs/engine/events/MidiLearnEvent.hpp
index 18cbcb43..c0fc4a17 100644
--- a/src/libs/engine/events/MidiLearnEvent.hpp
+++ b/src/libs/engine/events/MidiLearnEvent.hpp
@@ -26,7 +26,7 @@ using std::string;
 
 namespace Ingen {
 
-class Node;
+class NodeImpl;
 class ControlChangeEvent;
 
 
@@ -72,8 +72,8 @@ public:
 	void post_process();
 
 private:
-	string  _node_path;
-	Node*   _node;
+	const string _node_path;
+	NodeImpl*    _node;
 	
 	/// Event to respond with when learned
 	MidiLearnResponseEvent* _response_event;
diff --git a/src/libs/engine/events/NoteEvent.cpp b/src/libs/engine/events/NoteEvent.cpp
index b0b3e926..72191d84 100644
--- a/src/libs/engine/events/NoteEvent.cpp
+++ b/src/libs/engine/events/NoteEvent.cpp
@@ -19,7 +19,7 @@
 #include "Responder.hpp"
 #include "Engine.hpp"
 #include "ObjectStore.hpp"
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "MidiNoteNode.hpp"
 #include "MidiTriggerNode.hpp"
 #include "Plugin.hpp"
@@ -32,7 +32,7 @@ namespace Ingen {
  *
  * Used to be triggered by MIDI.  Not used anymore.
  */
-NoteEvent::NoteEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, Node* node, bool on, uchar note_num, uchar velocity)
+NoteEvent::NoteEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, NodeImpl* node, bool on, uchar note_num, uchar velocity)
 : Event(engine, responder, timestamp),
   _node(node),
   _on(on),
diff --git a/src/libs/engine/events/NoteEvent.hpp b/src/libs/engine/events/NoteEvent.hpp
index 93e61113..31ae9d27 100644
--- a/src/libs/engine/events/NoteEvent.hpp
+++ b/src/libs/engine/events/NoteEvent.hpp
@@ -25,7 +25,7 @@ using std::string;
 
 namespace Ingen {
 
-class Node;
+class NodeImpl;
 
 
 /** A note on event.
@@ -38,7 +38,7 @@ public:
 	NoteEvent(Engine&              engine,
 	          SharedPtr<Responder> responder,
 	          SampleCount          timestamp,
-	          Node*                node,
+	          NodeImpl*            node,
 			  bool                 on,
 	          uchar                note_num,
 	          uchar                velocity);
@@ -55,7 +55,7 @@ public:
 	void post_process();
 
 private:
-	Node*        _node;
+	NodeImpl*    _node;
 	const string _node_path;
 	bool         _on;
 	uchar        _note_num;
diff --git a/src/libs/engine/events/RenameEvent.cpp b/src/libs/engine/events/RenameEvent.cpp
index c643e456..edd67fad 100644
--- a/src/libs/engine/events/RenameEvent.cpp
+++ b/src/libs/engine/events/RenameEvent.cpp
@@ -18,7 +18,7 @@
 #include <raul/Path.hpp>
 #include "ClientBroadcaster.hpp"
 #include "Engine.hpp"
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "ObjectStore.hpp"
 #include "Patch.hpp"
 #include "RenameEvent.hpp"
diff --git a/src/libs/engine/events/RenameEvent.hpp b/src/libs/engine/events/RenameEvent.hpp
index e01f4409..1a68173f 100644
--- a/src/libs/engine/events/RenameEvent.hpp
+++ b/src/libs/engine/events/RenameEvent.hpp
@@ -32,7 +32,7 @@ namespace Ingen {
 
 class GraphObjectImpl;
 class Patch;
-class Node;
+class NodeImpl;
 class Plugin;
 class DisconnectNodeEvent;
 class DisconnectPortEvent;
diff --git a/src/libs/engine/events/RequestObjectEvent.cpp b/src/libs/engine/events/RequestObjectEvent.cpp
index 4c875e45..0c46546f 100644
--- a/src/libs/engine/events/RequestObjectEvent.cpp
+++ b/src/libs/engine/events/RequestObjectEvent.cpp
@@ -23,7 +23,7 @@
 #include "ObjectStore.hpp"
 #include "ClientBroadcaster.hpp"
 #include "Patch.hpp"
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "Port.hpp"
 #include "ObjectSender.hpp"
 #include "ProcessContext.hpp"
@@ -72,7 +72,7 @@ RequestObjectEvent::post_process()
 			return;
 		}
 		
-		Node* const node = dynamic_cast<Node*>(_object);
+		NodeImpl* const node = dynamic_cast<NodeImpl*>(_object);
 		if (node) {
 			_responder->respond_ok();
 			ObjectSender::send_node(_responder->client(), node, true);
diff --git a/src/libs/engine/events/SetPolyphonicEvent.cpp b/src/libs/engine/events/SetPolyphonicEvent.cpp
index bce9a1b2..04bdc6aa 100644
--- a/src/libs/engine/events/SetPolyphonicEvent.cpp
+++ b/src/libs/engine/events/SetPolyphonicEvent.cpp
@@ -24,7 +24,7 @@
 #include "util.hpp"
 #include "ObjectStore.hpp"
 #include "Port.hpp"
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "Connection.hpp"
 #include "QueuedEventSource.hpp"
 
diff --git a/src/libs/engine/events/SetPolyphonyEvent.cpp b/src/libs/engine/events/SetPolyphonyEvent.cpp
index 7a261b5e..a1f03add 100644
--- a/src/libs/engine/events/SetPolyphonyEvent.cpp
+++ b/src/libs/engine/events/SetPolyphonyEvent.cpp
@@ -24,7 +24,7 @@
 #include "util.hpp"
 #include "ObjectStore.hpp"
 #include "Port.hpp"
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "Connection.hpp"
 #include "QueuedEventSource.hpp"
 
diff --git a/src/libs/engine/events/SetPortValueEvent.cpp b/src/libs/engine/events/SetPortValueEvent.cpp
index b0fc273e..cc7a79e3 100644
--- a/src/libs/engine/events/SetPortValueEvent.cpp
+++ b/src/libs/engine/events/SetPortValueEvent.cpp
@@ -21,7 +21,7 @@
 #include "Engine.hpp"
 #include "Port.hpp"
 #include "ClientBroadcaster.hpp"
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "ObjectStore.hpp"
 #include "AudioBuffer.hpp"
 #include "MidiBuffer.hpp"
diff --git a/src/libs/engine/events/SetPortValueQueuedEvent.cpp b/src/libs/engine/events/SetPortValueQueuedEvent.cpp
index 00de1cce..941905fc 100644
--- a/src/libs/engine/events/SetPortValueQueuedEvent.cpp
+++ b/src/libs/engine/events/SetPortValueQueuedEvent.cpp
@@ -22,7 +22,7 @@
 #include "Port.hpp"
 #include "ClientBroadcaster.hpp"
 #include "Plugin.hpp"
-#include "Node.hpp"
+#include "NodeImpl.hpp"
 #include "ObjectStore.hpp"
 #include "AudioBuffer.hpp"
 #include "MidiBuffer.hpp"