From 23683a3e4f03dd8f7cdb1dc1a1592fdaa9d18b23 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 7 Oct 2007 19:41:15 +0000 Subject: Added common abstract interface for Plugins. git-svn-id: http://svn.drobilla.net/lad/ingen@837 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/events/CreateNodeEvent.cpp | 4 ++-- src/libs/engine/events/CreatePatchEvent.cpp | 2 +- src/libs/engine/events/CreatePortEvent.cpp | 2 +- src/libs/engine/events/DSSIConfigureEvent.cpp | 4 +++- src/libs/engine/events/DSSIControlEvent.cpp | 2 +- src/libs/engine/events/DSSIProgramEvent.cpp | 2 +- src/libs/engine/events/DSSIUpdateEvent.cpp | 2 +- src/libs/engine/events/DestroyEvent.cpp | 2 +- src/libs/engine/events/MidiLearnEvent.cpp | 2 +- src/libs/engine/events/NoteEvent.cpp | 2 +- src/libs/engine/events/RequestPluginEvent.cpp | 4 ++-- src/libs/engine/events/RequestPluginEvent.hpp | 8 +++----- src/libs/engine/events/RequestPluginsEvent.hpp | 4 ++-- src/libs/engine/events/SetPortValueQueuedEvent.cpp | 4 ++-- 14 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/libs/engine/events') diff --git a/src/libs/engine/events/CreateNodeEvent.cpp b/src/libs/engine/events/CreateNodeEvent.cpp index 991ee0a8..df891cd3 100644 --- a/src/libs/engine/events/CreateNodeEvent.cpp +++ b/src/libs/engine/events/CreateNodeEvent.cpp @@ -22,7 +22,7 @@ #include "Responder.hpp" #include "Patch.hpp" #include "NodeImpl.hpp" -#include "Plugin.hpp" +#include "PluginImpl.hpp" #include "Engine.hpp" #include "Patch.hpp" #include "NodeFactory.hpp" @@ -78,7 +78,7 @@ CreateNodeEvent::pre_process() _patch = _engine.object_store()->find_patch(_path.parent()); - const Plugin* plugin = (_plugin_uri != "") + const PluginImpl* plugin = (_plugin_uri != "") ? _engine.node_factory()->plugin(_plugin_uri) : _engine.node_factory()->plugin(_plugin_type, _plugin_lib, _plugin_label); diff --git a/src/libs/engine/events/CreatePatchEvent.cpp b/src/libs/engine/events/CreatePatchEvent.cpp index a7cc7f8c..a5b907ab 100644 --- a/src/libs/engine/events/CreatePatchEvent.cpp +++ b/src/libs/engine/events/CreatePatchEvent.cpp @@ -21,7 +21,7 @@ #include "Responder.hpp" #include "Patch.hpp" #include "NodeImpl.hpp" -#include "Plugin.hpp" +#include "PluginImpl.hpp" #include "Engine.hpp" #include "ClientBroadcaster.hpp" #include "AudioDriver.hpp" diff --git a/src/libs/engine/events/CreatePortEvent.cpp b/src/libs/engine/events/CreatePortEvent.cpp index 6163d4ab..065ca4a3 100644 --- a/src/libs/engine/events/CreatePortEvent.cpp +++ b/src/libs/engine/events/CreatePortEvent.cpp @@ -22,7 +22,7 @@ #include "Responder.hpp" #include "CreatePortEvent.hpp" #include "Patch.hpp" -#include "Plugin.hpp" +#include "PluginImpl.hpp" #include "Engine.hpp" #include "Patch.hpp" #include "QueuedEventSource.hpp" diff --git a/src/libs/engine/events/DSSIConfigureEvent.cpp b/src/libs/engine/events/DSSIConfigureEvent.cpp index 631ee608..25c9ab31 100644 --- a/src/libs/engine/events/DSSIConfigureEvent.cpp +++ b/src/libs/engine/events/DSSIConfigureEvent.cpp @@ -19,9 +19,11 @@ #include "Engine.hpp" #include "NodeImpl.hpp" #include "ClientBroadcaster.hpp" -#include "Plugin.hpp" +#include "PluginImpl.hpp" #include "ObjectStore.hpp" +using namespace std; + namespace Ingen { diff --git a/src/libs/engine/events/DSSIControlEvent.cpp b/src/libs/engine/events/DSSIControlEvent.cpp index 25bcaaf4..70c7dc99 100644 --- a/src/libs/engine/events/DSSIControlEvent.cpp +++ b/src/libs/engine/events/DSSIControlEvent.cpp @@ -18,7 +18,7 @@ #include "DSSIControlEvent.hpp" #include "Engine.hpp" #include "NodeImpl.hpp" -#include "Plugin.hpp" +#include "PluginImpl.hpp" #include "ObjectStore.hpp" namespace Ingen { diff --git a/src/libs/engine/events/DSSIProgramEvent.cpp b/src/libs/engine/events/DSSIProgramEvent.cpp index d47e3294..94cd20dc 100644 --- a/src/libs/engine/events/DSSIProgramEvent.cpp +++ b/src/libs/engine/events/DSSIProgramEvent.cpp @@ -21,7 +21,7 @@ #include "Engine.hpp" #include "NodeImpl.hpp" #include "ClientBroadcaster.hpp" -#include "Plugin.hpp" +#include "PluginImpl.hpp" #include "ObjectStore.hpp" using std::cout; using std::cerr; using std::endl; diff --git a/src/libs/engine/events/DSSIUpdateEvent.cpp b/src/libs/engine/events/DSSIUpdateEvent.cpp index 61d2ab97..8f2eea6a 100644 --- a/src/libs/engine/events/DSSIUpdateEvent.cpp +++ b/src/libs/engine/events/DSSIUpdateEvent.cpp @@ -21,7 +21,7 @@ #include "ObjectStore.hpp" #include "Engine.hpp" #include "DSSINode.hpp" -#include "Plugin.hpp" +#include "PluginImpl.hpp" using std::cerr; using std::endl; diff --git a/src/libs/engine/events/DestroyEvent.cpp b/src/libs/engine/events/DestroyEvent.cpp index 96d8874a..575b1973 100644 --- a/src/libs/engine/events/DestroyEvent.cpp +++ b/src/libs/engine/events/DestroyEvent.cpp @@ -22,7 +22,7 @@ #include "Engine.hpp" #include "Patch.hpp" #include "NodeBase.hpp" -#include "Plugin.hpp" +#include "PluginImpl.hpp" #include "AudioDriver.hpp" #include "MidiDriver.hpp" #include "DisconnectNodeEvent.hpp" diff --git a/src/libs/engine/events/MidiLearnEvent.cpp b/src/libs/engine/events/MidiLearnEvent.cpp index 683c879a..2cb39c0e 100644 --- a/src/libs/engine/events/MidiLearnEvent.cpp +++ b/src/libs/engine/events/MidiLearnEvent.cpp @@ -22,7 +22,7 @@ #include "NodeImpl.hpp" #include "MidiControlNode.hpp" #include "ClientBroadcaster.hpp" -#include "Plugin.hpp" +#include "PluginImpl.hpp" namespace Ingen { diff --git a/src/libs/engine/events/NoteEvent.cpp b/src/libs/engine/events/NoteEvent.cpp index 72191d84..9c69b9df 100644 --- a/src/libs/engine/events/NoteEvent.cpp +++ b/src/libs/engine/events/NoteEvent.cpp @@ -22,7 +22,7 @@ #include "NodeImpl.hpp" #include "MidiNoteNode.hpp" #include "MidiTriggerNode.hpp" -#include "Plugin.hpp" +#include "PluginImpl.hpp" #include "ProcessContext.hpp" namespace Ingen { diff --git a/src/libs/engine/events/RequestPluginEvent.cpp b/src/libs/engine/events/RequestPluginEvent.cpp index af7a4754..f2886902 100644 --- a/src/libs/engine/events/RequestPluginEvent.cpp +++ b/src/libs/engine/events/RequestPluginEvent.cpp @@ -15,16 +15,16 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "RequestPluginEvent.hpp" #include #include "interface/ClientInterface.hpp" +#include "RequestPluginEvent.hpp" #include "Responder.hpp" #include "Engine.hpp" #include "Port.hpp" #include "ObjectStore.hpp" #include "ClientBroadcaster.hpp" #include "NodeFactory.hpp" -#include "Plugin.hpp" +#include "PluginImpl.hpp" #include "ProcessContext.hpp" using std::string; diff --git a/src/libs/engine/events/RequestPluginEvent.hpp b/src/libs/engine/events/RequestPluginEvent.hpp index a4c6cd09..cca43627 100644 --- a/src/libs/engine/events/RequestPluginEvent.hpp +++ b/src/libs/engine/events/RequestPluginEvent.hpp @@ -26,9 +26,7 @@ using std::string; namespace Ingen { -class Plugin; -namespace Shared { class ClientInterface; } -using Shared::ClientInterface; +class PluginImpl; /** A request from a client to send the value of a port. @@ -45,8 +43,8 @@ public: void post_process(); private: - string _uri; - const Plugin* _plugin; + const string _uri; + const PluginImpl* _plugin; }; diff --git a/src/libs/engine/events/RequestPluginsEvent.hpp b/src/libs/engine/events/RequestPluginsEvent.hpp index 92a042f9..ae6a77a9 100644 --- a/src/libs/engine/events/RequestPluginsEvent.hpp +++ b/src/libs/engine/events/RequestPluginsEvent.hpp @@ -25,7 +25,7 @@ using std::string; namespace Ingen { -class Plugin; +class PluginImpl; class Responder; namespace Shared { class ClientInterface; @@ -45,7 +45,7 @@ public: void post_process(); private: - std::list _plugins; + std::list _plugins; }; diff --git a/src/libs/engine/events/SetPortValueQueuedEvent.cpp b/src/libs/engine/events/SetPortValueQueuedEvent.cpp index 941905fc..026f22b6 100644 --- a/src/libs/engine/events/SetPortValueQueuedEvent.cpp +++ b/src/libs/engine/events/SetPortValueQueuedEvent.cpp @@ -21,7 +21,7 @@ #include "Engine.hpp" #include "Port.hpp" #include "ClientBroadcaster.hpp" -#include "Plugin.hpp" +#include "PluginImpl.hpp" #include "NodeImpl.hpp" #include "ObjectStore.hpp" #include "AudioBuffer.hpp" @@ -144,7 +144,7 @@ SetPortValueQueuedEvent::post_process() } else if (_error == NO_SPACE) { std::ostringstream msg("Attempt to write "); msg << _data_size << " bytes to " << _port_path << ", with capacity " - << _port->buffer_size() << endl; + << _port->buffer_size() << std::endl; _responder->respond_error(msg.str()); } } -- cgit v1.2.1