From 9da093217352daa1fb61a6f2daf5195640e286a7 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 16 Mar 2012 04:13:23 +0000
Subject: Merge ClientInterface and ServerInterface.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4067 a436a847-0d15-0410-975c-d299462d15a1
---
 src/shared/Builder.cpp |  4 ++--
 src/shared/World.cpp   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/shared')

diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp
index 9dea08f0..3b49bd41 100644
--- a/src/shared/Builder.cpp
+++ b/src/shared/Builder.cpp
@@ -18,7 +18,7 @@
 #include "raul/Atom.hpp"
 #include "raul/Path.hpp"
 
-#include "ingen/CommonInterface.hpp"
+#include "ingen/Interface.hpp"
 #include "ingen/Connection.hpp"
 #include "ingen/Node.hpp"
 #include "ingen/Patch.hpp"
@@ -34,7 +34,7 @@ using namespace Raul;
 namespace Ingen {
 namespace Shared {
 
-Builder::Builder(SharedPtr<Shared::URIs> uris, CommonInterface& interface)
+Builder::Builder(SharedPtr<Shared::URIs> uris, Interface& interface)
 	: _uris(uris)
 	, _interface(interface)
 {
diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index fe5e025c..e3551302 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -26,6 +26,7 @@
 #include "raul/Atom.hpp"
 #include "sord/sordmm.hpp"
 
+#include "ingen/Interface.hpp"
 #include "ingen/EngineBase.hpp"
 #include "ingen/shared/Module.hpp"
 #include "ingen/shared/World.hpp"
@@ -176,7 +177,7 @@ public:
 	Sord::World*                         rdf_world;
 	SharedPtr<LV2URIMap>                 lv2_uri_map;
 	SharedPtr<URIs>                      uris;
-	SharedPtr<ServerInterface>           engine;
+	SharedPtr<Interface>                 engine;
 	SharedPtr<EngineBase>                local_engine;
 	SharedPtr<Serialisation::Serialiser> serialiser;
 	SharedPtr<Serialisation::Parser>     parser;
@@ -201,7 +202,7 @@ World::~World()
 }
 
 void World::set_local_engine(SharedPtr<EngineBase> e)              { _impl->local_engine = e; }
-void World::set_engine(SharedPtr<ServerInterface> e)               { _impl->engine = e; }
+void World::set_engine(SharedPtr<Interface> 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; }
@@ -210,7 +211,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<ServerInterface>           World::engine()       { return _impl->engine; }
+SharedPtr<Interface>                 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; }
@@ -271,16 +272,15 @@ World::unload_modules()
 
 /** Get an interface for a remote engine at @a url
  */
-SharedPtr<ServerInterface>
-World::interface(
-	const std::string&         engine_url,
-	SharedPtr<ClientInterface> respond_to)
+SharedPtr<Interface>
+World::interface(const std::string&   engine_url,
+                 SharedPtr<Interface> respond_to)
 {
 	const string scheme = engine_url.substr(0, engine_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<ServerInterface>();
+		return SharedPtr<Interface>();
 	}
 
 	return i->second(this, engine_url, respond_to);
-- 
cgit v1.2.1