From e772196c07ff58022beaabf5e494be3441d1ba4a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 10 Sep 2006 20:11:40 +0000 Subject: Zoom Full feature in FlowCanvas/Ingenuity. Fix for reattaching to running engine (reponse ID bug). More GUI work. git-svn-id: http://svn.drobilla.net/lad/ingen@126 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/events/ClearPatchEvent.cpp | 4 ++-- src/libs/engine/events/ClearPatchEvent.h | 2 +- src/libs/engine/events/DestroyEvent.cpp | 8 ++++---- src/libs/engine/events/DestroyEvent.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/libs/engine/events') diff --git a/src/libs/engine/events/ClearPatchEvent.cpp b/src/libs/engine/events/ClearPatchEvent.cpp index b8f31243..5023e89e 100644 --- a/src/libs/engine/events/ClearPatchEvent.cpp +++ b/src/libs/engine/events/ClearPatchEvent.cpp @@ -30,8 +30,8 @@ namespace Ingen { -ClearPatchEvent::ClearPatchEvent(Engine& engine, CountedPtr responder, SampleCount timestamp, const string& patch_path) -: QueuedEvent(engine, responder, true), +ClearPatchEvent::ClearPatchEvent(Engine& engine, CountedPtr responder, FrameTime time, QueuedEventSource* source, const string& patch_path) +: QueuedEvent(engine, responder, time, true, source), m_patch_path(patch_path), m_patch(NULL), m_process(false) diff --git a/src/libs/engine/events/ClearPatchEvent.h b/src/libs/engine/events/ClearPatchEvent.h index 0eb9b495..234b8a51 100644 --- a/src/libs/engine/events/ClearPatchEvent.h +++ b/src/libs/engine/events/ClearPatchEvent.h @@ -35,7 +35,7 @@ class Patch; class ClearPatchEvent : public QueuedEvent { public: - ClearPatchEvent(Engine& engine, CountedPtr responder, SampleCount timestamp, const string& patch_path); + ClearPatchEvent(Engine& engine, CountedPtr responder, FrameTime time, QueuedEventSource* source, const string& patch_path); void pre_process(); void execute(SampleCount nframes, FrameTime start, FrameTime end); diff --git a/src/libs/engine/events/DestroyEvent.cpp b/src/libs/engine/events/DestroyEvent.cpp index ced323a1..bdf5f679 100644 --- a/src/libs/engine/events/DestroyEvent.cpp +++ b/src/libs/engine/events/DestroyEvent.cpp @@ -34,8 +34,8 @@ namespace Ingen { -DestroyEvent::DestroyEvent(Engine& engine, CountedPtr responder, FrameTime time, QueuedEventSource* source, const string& path, bool lock_mutex) -: QueuedEvent(engine, responder, time, true, source), +DestroyEvent::DestroyEvent(Engine& engine, CountedPtr responder, FrameTime time, QueuedEventSource* source, const string& path, bool block) +: QueuedEvent(engine, responder, time, source, source), m_path(path), m_node(NULL), m_patch_listnode(NULL), @@ -47,8 +47,8 @@ DestroyEvent::DestroyEvent(Engine& engine, CountedPtr responder, Fram } -DestroyEvent::DestroyEvent(Engine& engine, CountedPtr responder, SampleCount timestamp, Node* node, bool lock_mutex) -: QueuedEvent(engine, responder, true), +DestroyEvent::DestroyEvent(Engine& engine, CountedPtr responder, FrameTime time, QueuedEventSource* source, Node* node, bool block) +: QueuedEvent(engine, responder, block, source), m_path(node->path()), m_node(node), m_patch_listnode(NULL), diff --git a/src/libs/engine/events/DestroyEvent.h b/src/libs/engine/events/DestroyEvent.h index 92b1c194..fc2995a3 100644 --- a/src/libs/engine/events/DestroyEvent.h +++ b/src/libs/engine/events/DestroyEvent.h @@ -44,8 +44,8 @@ class DisconnectPortEvent; class DestroyEvent : public QueuedEvent { public: - DestroyEvent(Engine& engine, CountedPtr responder, FrameTime timestamp, QueuedEventSource* source, const string& path, bool lock_mutex = true); - DestroyEvent(Engine& engine, CountedPtr responder, FrameTime timestamp, Node* node, bool lock_mutex = true); + DestroyEvent(Engine& engine, CountedPtr responder, FrameTime timestamp, QueuedEventSource* source, const string& path, bool block = true); + DestroyEvent(Engine& engine, CountedPtr responder, FrameTime timestamp, QueuedEventSource* source, Node* node, bool block = true); ~DestroyEvent(); void pre_process(); -- cgit v1.2.1