summaryrefslogtreecommitdiffstats
path: root/src/server/events/Delete.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-08-18 23:05:06 +0000
committerDavid Robillard <d@drobilla.net>2012-08-18 23:05:06 +0000
commit317627ef40f7654c298aa1ac707851c852259e3a (patch)
tree38f7ed57aafb7b3b8e21e6caa3429a39207e4a9a /src/server/events/Delete.cpp
parent160b2baf7df8b960f22619c013b3197c0dc51c2b (diff)
downloadingen-317627ef40f7654c298aa1ac707851c852259e3a.tar.gz
ingen-317627ef40f7654c298aa1ac707851c852259e3a.tar.bz2
ingen-317627ef40f7654c298aa1ac707851c852259e3a.zip
Node => Block
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4720 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/events/Delete.cpp')
-rw-r--r--src/server/events/Delete.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp
index d2e3e58e..dbda331c 100644
--- a/src/server/events/Delete.cpp
+++ b/src/server/events/Delete.cpp
@@ -18,6 +18,7 @@
#include "raul/Maid.hpp"
#include "raul/Path.hpp"
+#include "BlockImpl.hpp"
#include "Broadcaster.hpp"
#include "ControlBindings.hpp"
#include "Delete.hpp"
@@ -25,7 +26,6 @@
#include "Driver.hpp"
#include "Engine.hpp"
#include "EnginePort.hpp"
-#include "NodeImpl.hpp"
#include "PatchImpl.hpp"
#include "PluginImpl.hpp"
#include "PortImpl.hpp"
@@ -73,24 +73,24 @@ Delete::pre_process()
return Event::pre_process_done(NOT_FOUND, _path);
}
- if (!(_node = PtrCast<NodeImpl>(iter->second))) {
+ if (!(_block = PtrCast<BlockImpl>(iter->second))) {
_port = PtrCast<DuplexPort>(iter->second);
}
- if (!_node && !_port) {
+ if (!_block && !_port) {
return Event::pre_process_done(NOT_DELETABLE, _path);
}
- PatchImpl* parent = _node ? _node->parent_patch() : _port->parent_patch();
+ PatchImpl* parent = _block ? _block->parent_patch() : _port->parent_patch();
if (!parent) {
return Event::pre_process_done(INTERNAL_ERROR, _path);
}
_engine.store()->remove(iter, _removed_objects);
- if (_node) {
- parent->remove_node(*_node);
- _disconnect_event = new DisconnectAll(_engine, parent, _node.get());
+ if (_block) {
+ parent->remove_block(*_block);
+ _disconnect_event = new DisconnectAll(_engine, parent, _block.get());
_disconnect_event->pre_process();
if (parent->enabled()) {
@@ -122,7 +122,7 @@ Delete::execute(ProcessContext& context)
_disconnect_event->execute(context);
}
- PatchImpl* parent = _node ? _node->parent_patch() : _port->parent_patch();
+ PatchImpl* parent = _block ? _block->parent_patch() : _port->parent_patch();
if (_port) {
_engine.maid()->dispose(parent->external_ports());
parent->external_ports(_ports_array);
@@ -143,9 +143,9 @@ Delete::post_process()
{
_lock.release();
_removed_bindings.reset();
- if (!respond() && (_node || _port)) {
- if (_node) {
- _node->deactivate();
+ if (!respond() && (_block || _port)) {
+ if (_block) {
+ _block->deactivate();
}
_engine.broadcaster()->bundle_begin();