From 10a5b76a65fb7ca7bf8c1f5869aaf763854e05a3 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 7 Jan 2010 01:34:42 +0000
Subject: Merge QueuedEventSource and EventSource.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2352 a436a847-0d15-0410-975c-d299462d15a1
---
 src/engine/events/CreatePort.cpp  | 4 ++--
 src/engine/events/CreatePort.hpp  | 2 +-
 src/engine/events/Delete.cpp      | 4 ++--
 src/engine/events/Delete.hpp      | 2 +-
 src/engine/events/LoadPlugins.cpp | 4 ++--
 src/engine/events/LoadPlugins.hpp | 2 +-
 src/engine/events/SetMetadata.cpp | 4 ++--
 src/engine/events/SetMetadata.hpp | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/engine/events')

diff --git a/src/engine/events/CreatePort.cpp b/src/engine/events/CreatePort.cpp
index 299e60e9..7845994a 100644
--- a/src/engine/events/CreatePort.cpp
+++ b/src/engine/events/CreatePort.cpp
@@ -26,7 +26,7 @@
 #include "PluginImpl.hpp"
 #include "Engine.hpp"
 #include "PatchImpl.hpp"
-#include "QueuedEventSource.hpp"
+#include "EventSource.hpp"
 #include "EngineStore.hpp"
 #include "ClientBroadcaster.hpp"
 #include "PortImpl.hpp"
@@ -49,7 +49,7 @@ CreatePort::CreatePort(
 		const Raul::Path&           path,
 		const Raul::URI&            type,
 		bool                        is_output,
-		QueuedEventSource*          source,
+		EventSource*                source,
 		const Resource::Properties& properties)
 	: QueuedEvent(engine, responder, timestamp, true, source)
 	, _error(NO_ERROR)
diff --git a/src/engine/events/CreatePort.hpp b/src/engine/events/CreatePort.hpp
index af58fcfe..c7ddb56a 100644
--- a/src/engine/events/CreatePort.hpp
+++ b/src/engine/events/CreatePort.hpp
@@ -47,7 +47,7 @@ public:
 			const Raul::Path&                   path,
 			const Raul::URI&                    type,
 			bool                                is_output,
-			QueuedEventSource*                  source,
+			EventSource*                        source,
 			const Shared::Resource::Properties& properties);
 
 	void pre_process();
diff --git a/src/engine/events/Delete.cpp b/src/engine/events/Delete.cpp
index 62ddedf1..91e18dd0 100644
--- a/src/engine/events/Delete.cpp
+++ b/src/engine/events/Delete.cpp
@@ -27,7 +27,7 @@
 #include "DisconnectAll.hpp"
 #include "ClientBroadcaster.hpp"
 #include "EngineStore.hpp"
-#include "QueuedEventSource.hpp"
+#include "EventSource.hpp"
 #include "PortImpl.hpp"
 
 using namespace std;
@@ -38,7 +38,7 @@ namespace Events {
 using namespace Shared;
 
 
-Delete::Delete(Engine& engine, SharedPtr<Responder> responder, FrameTime time, QueuedEventSource* source, const Raul::Path& path)
+Delete::Delete(Engine& engine, SharedPtr<Responder> responder, FrameTime time, EventSource* source, const Raul::Path& path)
 	: QueuedEvent(engine, responder, time, true, source)
 	, _path(path)
 	, _store_iterator(engine.engine_store()->end())
diff --git a/src/engine/events/Delete.hpp b/src/engine/events/Delete.hpp
index a72dcc12..ac46030f 100644
--- a/src/engine/events/Delete.hpp
+++ b/src/engine/events/Delete.hpp
@@ -61,7 +61,7 @@ public:
 			Engine&              engine,
 			SharedPtr<Responder> responder,
 			FrameTime            timestamp,
-			QueuedEventSource*   source,
+			EventSource*         source,
 			const Raul::Path&    path);
 
 	~Delete();
diff --git a/src/engine/events/LoadPlugins.cpp b/src/engine/events/LoadPlugins.cpp
index e8ae8ce2..65043757 100644
--- a/src/engine/events/LoadPlugins.cpp
+++ b/src/engine/events/LoadPlugins.cpp
@@ -20,13 +20,13 @@
 #include "Engine.hpp"
 #include "NodeFactory.hpp"
 #include "ClientBroadcaster.hpp"
-#include "QueuedEventSource.hpp"
+#include "EventSource.hpp"
 
 namespace Ingen {
 namespace Events {
 
 
-LoadPlugins::LoadPlugins(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, QueuedEventSource* source)
+LoadPlugins::LoadPlugins(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, EventSource* source)
 	: QueuedEvent(engine, responder, timestamp, true, source)
 {
 }
diff --git a/src/engine/events/LoadPlugins.hpp b/src/engine/events/LoadPlugins.hpp
index 8dce2a27..3549fdfd 100644
--- a/src/engine/events/LoadPlugins.hpp
+++ b/src/engine/events/LoadPlugins.hpp
@@ -34,7 +34,7 @@ public:
 	LoadPlugins(Engine&              engine,
 	            SharedPtr<Responder> responder,
 	            SampleCount          timestamp,
-	            QueuedEventSource*   source);
+	            EventSource*         source);
 
 	void pre_process();
 	void post_process();
diff --git a/src/engine/events/SetMetadata.cpp b/src/engine/events/SetMetadata.cpp
index 53e79977..6c8c25f3 100644
--- a/src/engine/events/SetMetadata.cpp
+++ b/src/engine/events/SetMetadata.cpp
@@ -29,7 +29,7 @@
 #include "PatchImpl.hpp"
 #include "PluginImpl.hpp"
 #include "PortImpl.hpp"
-#include "QueuedEventSource.hpp"
+#include "EventSource.hpp"
 #include "Responder.hpp"
 #include "SetMetadata.hpp"
 #include "SetPortValue.hpp"
@@ -48,7 +48,7 @@ SetMetadata::SetMetadata(
 		Engine&               engine,
 		SharedPtr<Responder>  responder,
 		SampleCount           timestamp,
-		QueuedEventSource*    source,
+		EventSource*          source,
 		bool                  replace,
 		bool                  meta,
 		const URI&            subject,
diff --git a/src/engine/events/SetMetadata.hpp b/src/engine/events/SetMetadata.hpp
index dc67d162..1417e02c 100644
--- a/src/engine/events/SetMetadata.hpp
+++ b/src/engine/events/SetMetadata.hpp
@@ -69,7 +69,7 @@ public:
 			Engine&                             engine,
 			SharedPtr<Responder>                responder,
 			SampleCount                         timestamp,
-			QueuedEventSource*                  source,
+			EventSource*                        source,
 			bool                                replace,
 			bool                                meta,
 			const Raul::URI&                    subject,
-- 
cgit v1.2.1