diff options
author | David Robillard <d@drobilla.net> | 2014-01-24 17:28:43 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2014-01-24 17:28:43 +0000 |
commit | a659a13c531e991851e013db3d4223bf16a343b8 (patch) | |
tree | 583112a95bc6abeb39dd514c987ff1c82b3d2e9e /ingen/client | |
parent | 28ab52045a429eb190ea1a23cef92d81c36748f5 (diff) | |
download | ingen-a659a13c531e991851e013db3d4223bf16a343b8.tar.gz ingen-a659a13c531e991851e013db3d4223bf16a343b8.tar.bz2 ingen-a659a13c531e991851e013db3d4223bf16a343b8.zip |
Fix various whitespace and formatting issues.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5325 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'ingen/client')
-rw-r--r-- | ingen/client/PluginModel.hpp | 1 | ||||
-rw-r--r-- | ingen/client/PluginUI.hpp | 1 | ||||
-rw-r--r-- | ingen/client/PortModel.hpp | 2 | ||||
-rw-r--r-- | ingen/client/SigClientInterface.hpp | 24 | ||||
-rw-r--r-- | ingen/client/ThreadedSigClientInterface.hpp | 33 |
5 files changed, 30 insertions, 31 deletions
diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp index 016e444e..79fae72d 100644 --- a/ingen/client/PluginModel.hpp +++ b/ingen/client/PluginModel.hpp @@ -108,4 +108,3 @@ private: } // namespace Ingen #endif // INGEN_CLIENT_PLUGINMODEL_HPP - diff --git a/ingen/client/PluginUI.hpp b/ingen/client/PluginUI.hpp index 1857d3e2..63e1074d 100644 --- a/ingen/client/PluginUI.hpp +++ b/ingen/client/PluginUI.hpp @@ -80,4 +80,3 @@ private: } // namespace Ingen #endif // INGEN_CLIENT_PLUGINUI_HPP - diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp index 84a5d0d8..647aa922 100644 --- a/ingen/client/PortModel.hpp +++ b/ingen/client/PortModel.hpp @@ -45,7 +45,7 @@ public: bool supports(const Raul::URI& value_type) const; - inline uint32_t index() const { return _index; } + inline uint32_t index() const { return _index; } inline const Atom& value() const { return get_property(_uris.ingen_value); } inline bool connected() const { return (_connections > 0); } inline bool is_input() const { return (_direction == Direction::INPUT); } diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp index 2210d4f4..07e6e333 100644 --- a/ingen/client/SigClientInterface.hpp +++ b/ingen/client/SigClientInterface.hpp @@ -70,44 +70,44 @@ protected: #define EMIT(name, ...) { _signal_ ## name (__VA_ARGS__); } void bundle_begin() - { EMIT(bundle_begin); } + { EMIT(bundle_begin); } void bundle_end() - { EMIT(bundle_end); } + { EMIT(bundle_end); } void response(int32_t id, Status status, const std::string& subject) - { EMIT(response, id, status, subject); } + { EMIT(response, id, status, subject); } void error(const std::string& msg) - { EMIT(error, msg); } + { EMIT(error, msg); } void put(const Raul::URI& uri, const Resource::Properties& properties, Resource::Graph ctx=Resource::Graph::DEFAULT) - { EMIT(put, uri, properties, ctx); } + { EMIT(put, uri, properties, ctx); } void delta(const Raul::URI& uri, const Resource::Properties& remove, const Resource::Properties& add) - { EMIT(delta, uri, remove, add); } + { EMIT(delta, uri, remove, add); } void connect(const Raul::Path& tail, const Raul::Path& head) - { EMIT(connection, tail, head); } + { EMIT(connection, tail, head); } void del(const Raul::URI& uri) - { EMIT(object_deleted, uri); } + { EMIT(object_deleted, uri); } void move(const Raul::Path& old_path, const Raul::Path& new_path) - { EMIT(object_moved, old_path, new_path); } + { EMIT(object_moved, old_path, new_path); } void disconnect(const Raul::Path& tail, const Raul::Path& head) - { EMIT(disconnection, tail, head); } + { EMIT(disconnection, tail, head); } void disconnect_all(const Raul::Path& graph, const Raul::Path& path) - { EMIT(disconnect_all, graph, path); } + { EMIT(disconnect_all, graph, path); } void set_property(const Raul::URI& subject, const Raul::URI& key, const Atom& value) - { EMIT(property_change, subject, key, value); } + { EMIT(property_change, subject, key, value); } void set_response_id(int32_t id) {} void get(const Raul::URI& uri) {} 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; |