diff options
Diffstat (limited to 'ingen/client/ThreadedSigClientInterface.hpp')
| -rw-r--r-- | ingen/client/ThreadedSigClientInterface.hpp | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp index 562c5fca..dbfe23bb 100644 --- a/ingen/client/ThreadedSigClientInterface.hpp +++ b/ingen/client/ThreadedSigClientInterface.hpp @@ -67,44 +67,44 @@ public: virtual Raul::URI uri() const { return Raul::URI("ingen:/clients/sig_queue"); } void bundle_begin() - { push_sig(bundle_begin_slot); } + { push_sig(bundle_begin_slot); } void bundle_end() - { push_sig(bundle_end_slot); } + { push_sig(bundle_end_slot); } void response(int32_t id, Status status, const std::string& subject) - { push_sig(sigc::bind(response_slot, id, status, subject)); } + { push_sig(sigc::bind(response_slot, id, status, subject)); } void error(const std::string& msg) - { push_sig(sigc::bind(error_slot, msg)); } + { push_sig(sigc::bind(error_slot, msg)); } void put(const Raul::URI& path, const Resource::Properties& properties, Resource::Graph ctx=Resource::Graph::DEFAULT) - { push_sig(sigc::bind(put_slot, path, properties, ctx)); } + { push_sig(sigc::bind(put_slot, path, properties, ctx)); } void delta(const Raul::URI& path, const Resource::Properties& remove, const Resource::Properties& add) - { push_sig(sigc::bind(delta_slot, path, remove, add)); } + { push_sig(sigc::bind(delta_slot, path, remove, add)); } void connect(const Raul::Path& tail, const Raul::Path& head) - { push_sig(sigc::bind(connection_slot, tail, head)); } + { push_sig(sigc::bind(connection_slot, tail, head)); } void del(const Raul::URI& uri) - { push_sig(sigc::bind(object_deleted_slot, uri)); } + { push_sig(sigc::bind(object_deleted_slot, uri)); } void move(const Raul::Path& old_path, const Raul::Path& new_path) - { push_sig(sigc::bind(object_moved_slot, old_path, new_path)); } + { push_sig(sigc::bind(object_moved_slot, old_path, new_path)); } void disconnect(const Raul::Path& tail, const Raul::Path& head) - { push_sig(sigc::bind(disconnection_slot, tail, head)); } + { push_sig(sigc::bind(disconnection_slot, tail, head)); } void disconnect_all(const Raul::Path& graph, const Raul::Path& path) - { push_sig(sigc::bind(disconnect_all_slot, graph, path)); } + { push_sig(sigc::bind(disconnect_all_slot, graph, path)); } void set_property(const Raul::URI& subject, const Raul::URI& key, const Atom& value) - { push_sig(sigc::bind(property_change_slot, subject, key, value)); } + { push_sig(sigc::bind(property_change_slot, subject, key, value)); } /** Process all queued events - Called from GTK thread to emit signals. */ bool emit_signals() { @@ -144,15 +144,16 @@ private: Raul::SRSWQueue<Closure> _sigs; + using Properties = Resource::Properties; + using Graph = Resource::Graph; + sigc::slot<void> bundle_begin_slot; sigc::slot<void> bundle_end_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, - Resource::Graph> put_slot; - sigc::slot<void, Raul::URI, Resource::Properties, - Resource::Properties> delta_slot; + sigc::slot<void, Raul::URI, Properties, Graph> put_slot; + sigc::slot<void, Raul::URI, Properties, Properties> delta_slot; sigc::slot<void, Raul::Path, Raul::Path> connection_slot; sigc::slot<void, Raul::URI> object_deleted_slot; sigc::slot<void, Raul::Path, Raul::Path> object_moved_slot; |