summaryrefslogtreecommitdiffstats
path: root/src/shared/World.hpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-05-24 23:29:42 +0000
committerDavid Robillard <d@drobilla.net>2011-05-24 23:29:42 +0000
commitacaab5ca7ce6869b8192de4f98c9f075fd17690e (patch)
tree731f14aa5cfb03e7f8837fe0c573b2b12ce7a8b4 /src/shared/World.hpp
parent881eac58c2f9bf1fcb18ef7dcda7ab025e327871 (diff)
downloadingen-acaab5ca7ce6869b8192de4f98c9f075fd17690e.tar.gz
ingen-acaab5ca7ce6869b8192de4f98c9f075fd17690e.tar.bz2
ingen-acaab5ca7ce6869b8192de4f98c9f075fd17690e.zip
Remove dependence on protocol-specific client headers in GUI code.
In other words, remove need for protocol-specific (and library dependent) headers to be in public headers... git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3318 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/shared/World.hpp')
-rw-r--r--src/shared/World.hpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/shared/World.hpp b/src/shared/World.hpp
index 3ce4d03e..6aacea36 100644
--- a/src/shared/World.hpp
+++ b/src/shared/World.hpp
@@ -34,6 +34,7 @@ namespace Sord { class World; }
namespace Ingen {
class EngineBase;
+class ClientInterface;
class ServerInterface;
namespace Serialisation { class Serialiser; class Parser; }
@@ -62,14 +63,16 @@ public:
virtual void unload_modules();
typedef SharedPtr<ServerInterface> (*InterfaceFactory)(
- World* world,
- const std::string& engine_url);
+ World* world,
+ const std::string& engine_url,
+ SharedPtr<ClientInterface> respond_to);
virtual void add_interface_factory(const std::string& scheme,
InterfaceFactory factory);
virtual SharedPtr<ServerInterface> interface(
- const std::string& engine_url);
+ const std::string& engine_url,
+ SharedPtr<ClientInterface> respond_to);
virtual bool run(const std::string& mime_type,
const std::string& filename);
@@ -79,12 +82,14 @@ public:
virtual void set_serialiser(SharedPtr<Serialisation::Serialiser> s);
virtual void set_parser(SharedPtr<Serialisation::Parser> p);
virtual void set_store(SharedPtr<Store> s);
+ virtual void set_client(SharedPtr<ClientInterface> c);
virtual SharedPtr<EngineBase> local_engine();
virtual SharedPtr<ServerInterface> engine();
virtual SharedPtr<Serialisation::Serialiser> serialiser();
virtual SharedPtr<Serialisation::Parser> parser();
virtual SharedPtr<Store> store();
+ virtual SharedPtr<ClientInterface> client();
virtual Sord::World* rdf_world();
virtual SharedPtr<LV2URIMap> uris();