summaryrefslogtreecommitdiffstats
path: root/ingen/client
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-03-16 04:13:23 +0000
committerDavid Robillard <d@drobilla.net>2012-03-16 04:13:23 +0000
commit9da093217352daa1fb61a6f2daf5195640e286a7 (patch)
treefb3489c04451dc14a61170ba2418123727414340 /ingen/client
parent119468f621a59d86da10bedf75c4427b70f9d370 (diff)
downloadingen-9da093217352daa1fb61a6f2daf5195640e286a7.tar.gz
ingen-9da093217352daa1fb61a6f2daf5195640e286a7.tar.bz2
ingen-9da093217352daa1fb61a6f2daf5195640e286a7.zip
Merge ClientInterface and ServerInterface.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4067 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'ingen/client')
-rw-r--r--ingen/client/ClientStore.hpp20
-rw-r--r--ingen/client/PluginModel.hpp2
-rw-r--r--ingen/client/PluginUI.hpp2
-rw-r--r--ingen/client/SigClientInterface.hpp8
-rw-r--r--ingen/client/ThreadedSigClientInterface.hpp4
5 files changed, 23 insertions, 13 deletions
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
diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp
index a0887454..62c5b92f 100644
--- a/ingen/client/PluginModel.hpp
+++ b/ingen/client/PluginModel.hpp
@@ -24,7 +24,7 @@
#include "sord/sordmm.hpp"
#include "ingen/Plugin.hpp"
-#include "ingen/ServerInterface.hpp"
+#include "ingen/Interface.hpp"
#include "ingen/client/signal.hpp"
#include "ingen/shared/ResourceImpl.hpp"
#include "ingen/shared/World.hpp"
diff --git a/ingen/client/PluginUI.hpp b/ingen/client/PluginUI.hpp
index 501db260..c99c5fb8 100644
--- a/ingen/client/PluginUI.hpp
+++ b/ingen/client/PluginUI.hpp
@@ -28,7 +28,7 @@
namespace Ingen {
-class ServerInterface;
+class Interface;
namespace Shared { class World; }
diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp
index db59be9d..afc4d66b 100644
--- a/ingen/client/SigClientInterface.hpp
+++ b/ingen/client/SigClientInterface.hpp
@@ -22,7 +22,7 @@
#include "raul/Path.hpp"
-#include "ingen/ClientInterface.hpp"
+#include "ingen/Interface.hpp"
#include "ingen/client/signal.hpp"
namespace Ingen {
@@ -36,7 +36,7 @@ namespace Client {
* The signals here match the calls to ClientInterface exactly. See the
* documentation for ClientInterface for meanings of signal parameters.
*/
-class SigClientInterface : public Ingen::ClientInterface,
+class SigClientInterface : public Ingen::Interface,
public INGEN_TRACKABLE
{
public:
@@ -109,6 +109,10 @@ protected:
void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value)
{ EMIT(property_change, subject, key, value); }
+
+ void set_response_id(int32_t id) {}
+ void ping() {}
+ void get(const Raul::URI& uri) {}
};
} // namespace Client
diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp
index 2a33eae8..30185c4c 100644
--- a/ingen/client/ThreadedSigClientInterface.hpp
+++ b/ingen/client/ThreadedSigClientInterface.hpp
@@ -29,7 +29,7 @@
#include "raul/Atom.hpp"
#include "raul/SRSWQueue.hpp"
-#include "ingen/ClientInterface.hpp"
+#include "ingen/Interface.hpp"
#include "ingen/client/SigClientInterface.hpp"
/** Returns nothing and takes no parameters (because they have all been bound) */
@@ -37,7 +37,7 @@ typedef sigc::slot<void> Closure;
namespace Ingen {
-class ServerInterface;
+class Interface;
namespace Client {