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
---
 ingen/client/ClientStore.hpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'ingen/client/ClientStore.hpp')

diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index e29723ae..dbba8e90 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -27,7 +27,7 @@
 #include "raul/SharedPtr.hpp"
 #include "raul/TableImpl.hpp"
 
-#include "ingen/ServerInterface.hpp"
+#include "ingen/Interface.hpp"
 #include "ingen/client/signal.hpp"
 #include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/Store.hpp"
@@ -54,13 +54,13 @@ class SigClientInterface;
  * \ingroup IngenClient
  */
 class ClientStore : public Shared::Store
-                  , public CommonInterface
+                  , public Interface
                   , public INGEN_TRACKABLE {
 public:
 	ClientStore(
 		SharedPtr<Shared::URIs>       uris,
-		SharedPtr<ServerInterface>    engine=SharedPtr<ServerInterface>(),
-		SharedPtr<SigClientInterface> emitter=SharedPtr<SigClientInterface>());
+		SharedPtr<Interface>          engine  = SharedPtr<Interface>(),
+		SharedPtr<SigClientInterface> emitter = SharedPtr<SigClientInterface>());
 
 	Raul::URI uri() const { return "ingen:ClientStore"; }
 
@@ -103,8 +103,14 @@ public:
 
 	void del(const Raul::URI& uri);
 
-	INGEN_SIGNAL(new_object,  void, SharedPtr<ObjectModel>);
-	INGEN_SIGNAL(new_plugin,  void, SharedPtr<PluginModel>);
+	void set_response_id(int32_t id) {}
+	void ping() {}
+	void get(const Raul::URI& uri) {}
+	void response(int32_t id, Status status) {}
+	void error(const std::string& msg) {}
+
+	INGEN_SIGNAL(new_object, void, SharedPtr<ObjectModel>);
+	INGEN_SIGNAL(new_plugin, void, SharedPtr<PluginModel>);
 
 private:
 	void add(GraphObject* o) { throw; }
@@ -129,7 +135,7 @@ private:
 	                        const Raul::Path& dst_port_path);
 
 	SharedPtr<Shared::URIs>       _uris;
-	SharedPtr<ServerInterface>    _engine;
+	SharedPtr<Interface>          _engine;
 	SharedPtr<SigClientInterface> _emitter;
 
 	SharedPtr<Plugins> _plugins; ///< Map, keyed by plugin URI
-- 
cgit v1.2.1