5 files changed, 22 insertions, 16 deletions

diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index e9589eaa..386f1d59 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -53,7 +53,7 @@ CreatePort::CreatePort(Engine&                     engine,
 	, _patch(NULL)
 	, _patch_port(NULL)
 	, _ports_array(NULL)
-	, _driver_port(NULL)
+	, _engine_port(NULL)
 	, _properties(properties)
 	, _is_output(is_output)
 {
@@ -148,9 +148,10 @@ CreatePort::pre_process()
 			_ports_array->at(old_num_ports) = _patch_port;
 			_engine.engine_store()->add(_patch_port);
 
-			if (!_patch->parent())
-				_driver_port = _engine.driver()->create_port(
+			if (!_patch->parent()) {
+				_engine_port = _engine.driver()->create_port(
 						dynamic_cast<DuplexPort*>(_patch_port));
+			}
 
 			assert(_ports_array->size() == _patch->num_ports());
 
@@ -171,8 +172,8 @@ CreatePort::execute(ProcessContext& context)
 		_patch->external_ports(_ports_array);
 	}
 
-	if (_driver_port) {
-		_engine.driver()->add_port(_driver_port);
+	if (_engine_port) {
+		_engine.driver()->add_port(_engine_port);
 	}
 }
 
diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp
index 74dc5698..6050cc18 100644
--- a/src/server/events/CreatePort.hpp
+++ b/src/server/events/CreatePort.hpp
@@ -30,7 +30,7 @@ namespace Server {
 
 class PatchImpl;
 class PortImpl;
-class DriverPort;
+class EnginePort;
 
 namespace Events {
 
@@ -61,7 +61,7 @@ private:
 	PatchImpl*              _patch;
 	PortImpl*               _patch_port;
 	Raul::Array<PortImpl*>* _ports_array; ///< New (external) ports array for Patch
-	DriverPort*             _driver_port; ///< Driver (eg Jack) port if this is a toplevel port
+	EnginePort*             _engine_port; ///< Driver (eg Jack) port if this is a toplevel port
 	Resource::Properties    _properties;
 	bool                    _is_output;
 };
diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp
index 13173ddb..a91702cc 100644
--- a/src/server/events/Delete.cpp
+++ b/src/server/events/Delete.cpp
@@ -16,12 +16,14 @@
 
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
+
 #include "ClientBroadcaster.hpp"
 #include "ControlBindings.hpp"
 #include "Delete.hpp"
 #include "DisconnectAll.hpp"
 #include "Driver.hpp"
 #include "Engine.hpp"
+#include "EnginePort.hpp"
 #include "EngineStore.hpp"
 #include "NodeImpl.hpp"
 #include "PatchImpl.hpp"
@@ -43,7 +45,7 @@ Delete::Delete(Engine&          engine,
 	, _uri(uri)
 	, _store_iterator(engine.engine_store()->end())
 	, _garbage(NULL)
-	, _driver_port(NULL)
+	, _engine_port(NULL)
 	, _patch_node_listnode(NULL)
 	, _patch_port_listnode(NULL)
 	, _ports_array(NULL)
@@ -155,7 +157,7 @@ Delete::execute(ProcessContext& context)
 		_port->parent_patch()->external_ports(_ports_array);
 
 		if ( ! _port->parent_patch()->parent())
-			_garbage = _engine.driver()->remove_port(_port->path(), &_driver_port);
+			_garbage = _engine.driver()->remove_port(_port->path(), &_engine_port);
 	}
 
 	if (parent_patch) {
@@ -198,8 +200,9 @@ Delete::post_process()
 		respond(FAILURE);
 	}
 
-	if (_driver_port)
-		_driver_port->destroy();
+	if (_engine_port) {
+		_engine_port->destroy();
+	}
 
 	_engine.maid()->push(_garbage);
 }
diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp
index d5e07812..ff4a4e07 100644
--- a/src/server/events/Delete.hpp
+++ b/src/server/events/Delete.hpp
@@ -33,7 +33,7 @@ namespace Server {
 class GraphObjectImpl;
 class NodeImpl;
 class PortImpl;
-class DriverPort;
+class EnginePort;
 class CompiledPatch;
 
 namespace Events {
@@ -76,7 +76,7 @@ private:
 	SharedPtr<NodeImpl>            _node;                ///< Non-NULL iff a node
 	SharedPtr<PortImpl>            _port;                ///< Non-NULL iff a port
 	Raul::Deletable*               _garbage;
-	DriverPort*                    _driver_port;
+	EnginePort*                    _engine_port;
 	PatchImpl::Nodes::Node*        _patch_node_listnode;
 	Raul::List<PortImpl*>::Node*   _patch_port_listnode;
 	Raul::Array<PortImpl*>*        _ports_array;         ///< New (external) ports for Patch
diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp
index 34ba6181..0969eea2 100644
--- a/src/server/events/Move.cpp
+++ b/src/server/events/Move.cpp
@@ -21,6 +21,7 @@
 #include "ClientBroadcaster.hpp"
 #include "Driver.hpp"
 #include "Engine.hpp"
+#include "EnginePort.hpp"
 #include "EngineStore.hpp"
 #include "NodeImpl.hpp"
 #include "PatchImpl.hpp"
@@ -105,9 +106,10 @@ Move::execute(ProcessContext& context)
 
 	SharedPtr<PortImpl> port = PtrCast<PortImpl>(_store_iterator->second);
 	if (port && port->parent()->parent() == NULL) {
-		DriverPort* driver_port = _engine.driver()->driver_port(_new_path);
-		if (driver_port)
-			driver_port->move(_new_path);
+		EnginePort* engine_port = _engine.driver()->engine_port(_new_path);
+		if (engine_port) {
+			engine_port->move(_new_path);
+		}
 	}
 }