Responder => Request, and handle EventSource unblocking from Request (simplify Event interfaces).

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

1 files changed, 8 insertions, 14 deletions

diff --git a/src/engine/QueuedEvent.hpp b/src/engine/QueuedEvent.hpp
index ab82b474..a75701c9 100644
--- a/src/engine/QueuedEvent.hpp
+++ b/src/engine/QueuedEvent.hpp
@@ -22,8 +22,6 @@
 
 namespace Ingen {
 
-class EventSource;
-
 
 /** An Event with a not-time-critical preprocessing stage.
  *
@@ -53,28 +51,24 @@ public:
 	bool is_prepared() { return _pre_processed; }
 
 protected:
-	QueuedEvent(Engine&              engine,
-	            SharedPtr<Responder> responder,
-	            FrameTime            time,
-	            bool                 blocking = false,
-	            EventSource*         source = NULL)
-		: Event(engine, responder, time)
-		, _source(source)
+	QueuedEvent(Engine&            engine,
+	            SharedPtr<Request> request,
+	            FrameTime          time,
+	            bool               blocking=false)
+		: Event(engine, request, time)
 		, _pre_processed(false)
 		, _blocking(blocking)
 	{}
 
 	// NULL event base (for internal events only!)
 	QueuedEvent(Engine& engine)
-		: Event(engine, SharedPtr<Responder>(), 0)
-		, _source(NULL)
+		: Event(engine, SharedPtr<Request>(), 0)
 		, _pre_processed(false)
 		, _blocking(false)
 	{}
 
-	EventSource* _source;
-	bool         _pre_processed;
-	bool         _blocking;
+	bool _pre_processed;
+	bool _blocking;
 };