diff options
| author | David Robillard <d@drobilla.net> | 2011-10-21 23:30:39 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-10-21 23:30:39 +0000 |
| commit | 5a413b8cd31006c8836bcc7409f7055c890f8a68 (patch) | |
| tree | 43add0ec00de9b323578d0f0c9ad0bd95011a74c /include | |
| parent | d7bc67f9752a90abf165c875839294befb42ef90 (diff) | |
| download | ingen-5a413b8cd31006c8836bcc7409f7055c890f8a68.tar.gz ingen-5a413b8cd31006c8836bcc7409f7055c890f8a68.tar.bz2 ingen-5a413b8cd31006c8836bcc7409f7055c890f8a68.zip | |
Move uri() to CommonInterface.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3575 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'include')
| -rw-r--r-- | include/ingen/ClientInterface.hpp | 2 | ||||
| -rw-r--r-- | include/ingen/CommonInterface.hpp | 2 | ||||
| -rw-r--r-- | include/ingen/ServerInterface.hpp | 2 | ||||
| -rw-r--r-- | include/ingen/client/ClientStore.hpp | 2 | ||||
| -rw-r--r-- | include/ingen/shared/ClashAvoider.hpp | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/include/ingen/ClientInterface.hpp b/include/ingen/ClientInterface.hpp index a2086926..a72c4743 100644 --- a/include/ingen/ClientInterface.hpp +++ b/include/ingen/ClientInterface.hpp @@ -40,8 +40,6 @@ class ClientInterface : public CommonInterface public: virtual ~ClientInterface() {} - virtual Raul::URI uri() const = 0; - virtual void response_ok(int32_t id) = 0; virtual void response_error(int32_t id, const std::string& msg) = 0; diff --git a/include/ingen/CommonInterface.hpp b/include/ingen/CommonInterface.hpp index 8b4713ab..398fbd3b 100644 --- a/include/ingen/CommonInterface.hpp +++ b/include/ingen/CommonInterface.hpp @@ -34,6 +34,8 @@ class CommonInterface public: virtual ~CommonInterface() {} + virtual Raul::URI uri() const = 0; + /** Begin an atomic bundle */ virtual void bundle_begin() = 0; diff --git a/include/ingen/ServerInterface.hpp b/include/ingen/ServerInterface.hpp index bf0b45ec..25016416 100644 --- a/include/ingen/ServerInterface.hpp +++ b/include/ingen/ServerInterface.hpp @@ -36,8 +36,6 @@ class ServerInterface : public CommonInterface public: virtual ~ServerInterface() {} - virtual Raul::URI uri() const = 0; - // Responses virtual void respond_to(ClientInterface* client, int32_t id) = 0; virtual void disable_responses() = 0; diff --git a/include/ingen/client/ClientStore.hpp b/include/ingen/client/ClientStore.hpp index a79b235c..12392db6 100644 --- a/include/ingen/client/ClientStore.hpp +++ b/include/ingen/client/ClientStore.hpp @@ -60,6 +60,8 @@ public: SharedPtr<ServerInterface> engine=SharedPtr<ServerInterface>(), SharedPtr<SigClientInterface> emitter=SharedPtr<SigClientInterface>()); + Raul::URI uri() const { return "ingen:ClientStore"; } + SharedPtr<const ObjectModel> object(const Raul::Path& path) const; SharedPtr<const PluginModel> plugin(const Raul::URI& uri) const; SharedPtr<const Resource> resource(const Raul::URI& uri) const; diff --git a/include/ingen/shared/ClashAvoider.hpp b/include/ingen/shared/ClashAvoider.hpp index 6c8e2018..4f5d8ec1 100644 --- a/include/ingen/shared/ClashAvoider.hpp +++ b/include/ingen/shared/ClashAvoider.hpp @@ -40,6 +40,8 @@ public: ClashAvoider(Store& store, CommonInterface& target, Store* also_avoid=NULL) : _store(store), _target(target), _also_avoid(also_avoid) {} + Raul::URI uri() const { return "ingen:ClientStore"; } + void set_target(CommonInterface& target) { _target = target; } // Bundles |