From 138a87e915ad3aff184730415105f94c874174bf Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 20 Apr 2011 16:26:40 +0000
Subject: 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
---
 src/shared/World.cpp | 10 +++++-----
 src/shared/World.hpp | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/shared')

diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index eea7bbd5..4c06a8f6 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -172,7 +172,7 @@ public:
 	LV2Features*                         lv2_features;
 	Sord::World*                         rdf_world;
 	SharedPtr<LV2URIMap>                 uris;
-    SharedPtr<EngineInterface>           engine;
+    SharedPtr<ServerInterface>           engine;
 	SharedPtr<EngineBase>                local_engine;
     SharedPtr<Serialisation::Serialiser> serialiser;
     SharedPtr<Serialisation::Parser>     parser;
@@ -193,7 +193,7 @@ World::~World()
 }
 
 void World::set_local_engine(SharedPtr<EngineBase> e)              { _impl->local_engine = e; }
-void World::set_engine(SharedPtr<EngineInterface> e)               { _impl->engine = e; }
+void World::set_engine(SharedPtr<ServerInterface> e)               { _impl->engine = e; }
 void World::set_serialiser(SharedPtr<Serialisation::Serialiser> s) { _impl->serialiser = s; }
 void World::set_parser(SharedPtr<Serialisation::Parser> p)         { _impl->parser = p; }
 void World::set_store(SharedPtr<Store> s)                          { _impl->store = s; }
@@ -202,7 +202,7 @@ void World::set_conf(Raul::Configuration* c)                       { _impl->conf
 int&                                 World::argc()         { return _impl->argc; }
 char**&                              World::argv()         { return _impl->argv; }
 SharedPtr<EngineBase>                World::local_engine() { return _impl->local_engine; }
-SharedPtr<EngineInterface>           World::engine()       { return _impl->engine; }
+SharedPtr<ServerInterface>           World::engine()       { return _impl->engine; }
 SharedPtr<Serialisation::Serialiser> World::serialiser()   { return _impl->serialiser; }
 SharedPtr<Serialisation::Parser>     World::parser()       { return _impl->parser; }
 SharedPtr<Store>                     World::store()        { return _impl->store; }
@@ -245,14 +245,14 @@ World::unload_modules()
 
 /** Get an interface for a remote engine at @a url
  */
-SharedPtr<EngineInterface>
+SharedPtr<ServerInterface>
 World::interface(const std::string& url)
 {
 	const string scheme = url.substr(0, url.find(":"));
 	const Pimpl::InterfaceFactories::const_iterator i = _impl->interface_factories.find(scheme);
 	if (i == _impl->interface_factories.end()) {
 		warn << "Unknown URI scheme `" << scheme << "'" << endl;
-		return SharedPtr<EngineInterface>();
+		return SharedPtr<ServerInterface>();
 	}
 
 	return i->second(this, url);
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();
-- 
cgit v1.2.1