diff options
| author | David Robillard <d@drobilla.net> | 2012-07-26 15:27:03 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-07-26 15:27:03 +0000 |
| commit | 3c5931bb13b5f88edcebb375fa6964dde8b85563 (patch) | |
| tree | 9801897576b7fb9d8a9f700847c670f216fc93b7 /ingen/client | |
| parent | b83ed4f83cf4c9b5054dcf55bea710313c369633 (diff) | |
| download | ingen-3c5931bb13b5f88edcebb375fa6964dde8b85563.tar.gz ingen-3c5931bb13b5f88edcebb375fa6964dde8b85563.tar.bz2 ingen-3c5931bb13b5f88edcebb375fa6964dde8b85563.zip | |
Report subject with errors to client for more meaningful error messages.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4556 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'ingen/client')
| -rw-r--r-- | ingen/client/ClientStore.hpp | 2 | ||||
| -rw-r--r-- | ingen/client/SigClientInterface.hpp | 6 | ||||
| -rw-r--r-- | ingen/client/ThreadedSigClientInterface.hpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp index 1512b941..b5a51a83 100644 --- a/ingen/client/ClientStore.hpp +++ b/ingen/client/ClientStore.hpp @@ -102,7 +102,7 @@ public: void set_response_id(int32_t id) {} void get(const Raul::URI& uri) {} - void response(int32_t id, Status status) {} + void response(int32_t id, Status status, const std::string& subject) {} void error(const std::string& msg) {} INGEN_SIGNAL(new_object, void, SharedPtr<ObjectModel>); diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp index 8b43bca0..4aef5a40 100644 --- a/ingen/client/SigClientInterface.hpp +++ b/ingen/client/SigClientInterface.hpp @@ -47,7 +47,7 @@ public: Raul::URI uri() const { return "http://drobilla.net/ns/ingen#internal"; } - INGEN_SIGNAL(response, void, int32_t, Status) + INGEN_SIGNAL(response, void, int32_t, Status, std::string) INGEN_SIGNAL(bundle_begin, void) INGEN_SIGNAL(bundle_end, void) INGEN_SIGNAL(error, void, std::string) @@ -75,8 +75,8 @@ protected: void bundle_end() { EMIT(bundle_end); } - void response(int32_t id, Status status) - { EMIT(response, id, status); } + void response(int32_t id, Status status, const std::string& subject) + { EMIT(response, id, status, subject); } void error(const std::string& msg) { EMIT(error, msg); } diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp index 71e1b2ee..c321f438 100644 --- a/ingen/client/ThreadedSigClientInterface.hpp +++ b/ingen/client/ThreadedSigClientInterface.hpp @@ -73,8 +73,8 @@ public: void bundle_end() { push_sig(bundle_end_slot); } - void response(int32_t id, Status status) - { push_sig(sigc::bind(response_slot, id, status)); } + void response(int32_t id, Status status, const std::string& subject) + { push_sig(sigc::bind(response_slot, id, status, subject)); } void error(const std::string& msg) { push_sig(sigc::bind(error_slot, msg)); } @@ -149,7 +149,7 @@ private: sigc::slot<void> bundle_begin_slot; sigc::slot<void> bundle_end_slot; - sigc::slot<void, int32_t, Status> response_slot; + sigc::slot<void, int32_t, Status, std::string> response_slot; sigc::slot<void, std::string> error_slot; sigc::slot<void, Raul::URI, Raul::URI, Raul::Symbol> new_plugin_slot; sigc::slot<void, Raul::URI, Resource::Properties, |