diff options
author | David Robillard <d@drobilla.net> | 2011-04-20 16:26:40 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-04-20 16:26:40 +0000 |
commit | 138a87e915ad3aff184730415105f94c874174bf (patch) | |
tree | 0d942bdddfdbcc3d969b4fce5592e770ab851b86 /src/shared/World.hpp | |
parent | 1f1758f4dda0ddaf01c0b1d3a756f9db8ddc979d (diff) | |
download | ingen-138a87e915ad3aff184730415105f94c874174bf.tar.gz ingen-138a87e915ad3aff184730415105f94c874174bf.tar.bz2 ingen-138a87e915ad3aff184730415105f94c874174bf.zip |
Rename Ingen::Engine to Ingen::Server (hopefully avoid odd name clases and fix #675).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3184 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/shared/World.hpp')
-rw-r--r-- | src/shared/World.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/shared/World.hpp b/src/shared/World.hpp index 7f100d8a..a0603bf0 100644 --- a/src/shared/World.hpp +++ b/src/shared/World.hpp @@ -36,7 +36,7 @@ namespace Sord { class World; } namespace Ingen { class EngineBase; -class EngineInterface; +class ServerInterface; namespace Serialisation { class Serialiser; class Parser; } @@ -63,27 +63,27 @@ public: virtual bool load_module(const char* name); virtual void unload_modules(); - typedef SharedPtr<EngineInterface> (*InterfaceFactory)( + typedef SharedPtr<ServerInterface> (*InterfaceFactory)( World* world, const std::string& engine_url); virtual void add_interface_factory(const std::string& scheme, InterfaceFactory factory); - virtual SharedPtr<EngineInterface> interface( + virtual SharedPtr<ServerInterface> interface( const std::string& engine_url); virtual bool run(const std::string& mime_type, const std::string& filename); virtual void set_local_engine(SharedPtr<EngineBase> e); - virtual void set_engine(SharedPtr<EngineInterface> e); + virtual void set_engine(SharedPtr<ServerInterface> e); virtual void set_serialiser(SharedPtr<Serialisation::Serialiser> s); virtual void set_parser(SharedPtr<Serialisation::Parser> p); virtual void set_store(SharedPtr<Store> s); virtual SharedPtr<EngineBase> local_engine(); - virtual SharedPtr<EngineInterface> engine(); + virtual SharedPtr<ServerInterface> engine(); virtual SharedPtr<Serialisation::Serialiser> serialiser(); virtual SharedPtr<Serialisation::Parser> parser(); virtual SharedPtr<Store> store(); |