diff options
| author | David Robillard <d@drobilla.net> | 2011-10-21 20:41:08 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-10-21 20:41:08 +0000 |
| commit | 4ce6781bd6727fca68d4c99337f47a75d849e5ab (patch) | |
| tree | 8b7fe459778b0a0e7452e3b593c8c77cdcf3d191 /src/server/events/Move.cpp | |
| parent | 6e416be77892b960bb429cab11cd4effce0033e1 (diff) | |
| download | ingen-4ce6781bd6727fca68d4c99337f47a75d849e5ab.tar.gz ingen-4ce6781bd6727fca68d4c99337f47a75d849e5ab.tar.bz2 ingen-4ce6781bd6727fca68d4c99337f47a75d849e5ab.zip | |
Merge QueuedEvent into Event.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3569 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/events/Move.cpp')
| -rw-r--r-- | src/server/events/Move.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp index ec2f763e..10be3bc8 100644 --- a/src/server/events/Move.cpp +++ b/src/server/events/Move.cpp @@ -36,7 +36,7 @@ namespace Server { namespace Events { Move::Move(Engine& engine, SharedPtr<Request> request, SampleCount timestamp, const Path& path, const Path& new_path) - : QueuedEvent(engine, request, timestamp) + : Event(engine, request, timestamp) , _old_path(path) , _new_path(new_path) , _parent_patch(NULL) @@ -55,19 +55,19 @@ Move::pre_process() if (!_old_path.parent().is_parent_of(_new_path)) { _error = PARENT_DIFFERS; - QueuedEvent::pre_process(); + Event::pre_process(); return; } _store_iterator = _engine.engine_store()->find(_old_path); if (_store_iterator == _engine.engine_store()->end()) { _error = OBJECT_NOT_FOUND; - QueuedEvent::pre_process(); + Event::pre_process(); return; } if (_engine.engine_store()->find_object(_new_path)) { _error = OBJECT_EXISTS; - QueuedEvent::pre_process(); + Event::pre_process(); return; } @@ -92,13 +92,13 @@ Move::pre_process() _engine.engine_store()->add(*removed.get()); - QueuedEvent::pre_process(); + Event::pre_process(); } void Move::execute(ProcessContext& context) { - QueuedEvent::execute(context); + Event::execute(context); SharedPtr<PortImpl> port = PtrCast<PortImpl>(_store_iterator->second); if (port && port->parent()->parent() == NULL) { |