Remove request_plugins from EngineInterface (and RequestPlugins event from engine), replacing with get of magic URI "ingen:plugins".

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

4 files changed, 14 insertions, 125 deletions

diff --git a/src/engine/events/Get.cpp b/src/engine/events/Get.cpp
index 05aa2f90..5031d794 100644
--- a/src/engine/events/Get.cpp
+++ b/src/engine/events/Get.cpp
@@ -49,27 +49,25 @@ Get::Get(
 void
 Get::pre_process()
 {
-	if (Path::is_valid(_uri.str()))
+	if (_uri == "ingen:plugins") {
+		_plugins = _engine.node_factory()->plugins();
+	} else if (Path::is_valid(_uri.str())) {
 		_object = _engine.engine_store()->find_object(Path(_uri.str()));
-	else
+	} else {
 		_plugin = _engine.node_factory()->plugin(_uri);
+	}
 
 	QueuedEvent::pre_process();
 }
 
 
 void
-Get::execute(ProcessContext& context)
-{
-	QueuedEvent::execute(context);
-	assert(_time >= context.start() && _time <= context.end());
-}
-
-
-void
 Get::post_process()
 {
-	if (!_object && !_plugin) {
+	if (_uri == "ingen:plugins") {
+		_request->respond_ok();
+		_engine.broadcaster()->send_plugins_to(_request->client(), _plugins);
+	} else if (!_object && !_plugin) {
 		_request->respond_error("Unable to find object requested.");
 	} else if (_request->client()) {
 		_request->respond_ok();
diff --git a/src/engine/events/Get.hpp b/src/engine/events/Get.hpp
index 2abae3a4..3592cd27 100644
--- a/src/engine/events/Get.hpp
+++ b/src/engine/events/Get.hpp
@@ -19,6 +19,7 @@
 #define INGEN_EVENTS_GET_HPP
 
 #include "QueuedEvent.hpp"
+#include "NodeFactory.hpp"
 #include "types.hpp"
 
 namespace Ingen {
@@ -43,13 +44,13 @@ public:
 		const Raul::URI&   uri);
 
 	void pre_process();
-	void execute(ProcessContext& context);
 	void post_process();
 
 private:
-	const Raul::URI   _uri;
-	GraphObjectImpl*  _object;
-	const PluginImpl* _plugin;
+	const Raul::URI      _uri;
+	GraphObjectImpl*     _object;
+	const PluginImpl*    _plugin;
+	NodeFactory::Plugins _plugins;
 };
 
 
diff --git a/src/engine/events/RequestPlugins.cpp b/src/engine/events/RequestPlugins.cpp
deleted file mode 100644
index 89507a23..00000000
--- a/src/engine/events/RequestPlugins.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/* This file is part of Ingen.
- * Copyright (C) 2007-2009 Dave Robillard <http://drobilla.net>
- *
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "RequestPlugins.hpp"
-#include "Request.hpp"
-#include "Engine.hpp"
-#include "ClientBroadcaster.hpp"
-#include "NodeFactory.hpp"
-
-namespace Ingen {
-namespace Events {
-
-
-RequestPlugins::RequestPlugins(Engine& engine, SharedPtr<Request> request, SampleCount timestamp)
-    : QueuedEvent(engine, request, timestamp)
-{
-}
-
-
-void
-RequestPlugins::pre_process()
-{
-	// Take a copy to send in the post processing thread (to avoid problems
-	// because std::map isn't thread safe)
-	_plugins = _engine.node_factory()->plugins();
-
-	QueuedEvent::pre_process();
-}
-
-
-void
-RequestPlugins::post_process()
-{
-	if (_request->client()) {
-		_engine.broadcaster()->send_plugins_to(_request->client(), _plugins);
-		_request->respond_ok();
-	} else {
-		_request->respond_error("Unable to find client to send plugins");
-	}
-}
-
-
-} // namespace Ingen
-} // namespace Events
-
diff --git a/src/engine/events/RequestPlugins.hpp b/src/engine/events/RequestPlugins.hpp
deleted file mode 100644
index 094edf51..00000000
--- a/src/engine/events/RequestPlugins.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/* This file is part of Ingen.
- * Copyright (C) 2007-2009 Dave Robillard <http://drobilla.net>
- *
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef INGEN_EVENTS_REQUESTPLUGINS_HPP
-#define INGEN_EVENTS_REQUESTPLUGINS_HPP
-
-#include "QueuedEvent.hpp"
-#include "NodeFactory.hpp"
-
-namespace Ingen {
-
-class Request;
-
-namespace Events {
-
-
-/** A request from a client to send notification of all objects (ie refresh).
- *
- * \ingroup engine
- */
-class RequestPlugins : public QueuedEvent
-{
-public:
-	RequestPlugins(Engine& engine, SharedPtr<Request> request, SampleCount timestamp);
-
-	void pre_process();
-	void post_process();
-
-private:
-	NodeFactory::Plugins _plugins;
-};
-
-
-} // namespace Ingen
-} // namespace Events
-
-#endif // INGEN_EVENTS_REQUESTPLUGINS_HPP