diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ingen/ClientInterface.hpp | 3 | ||||
| -rw-r--r-- | include/ingen/client/ClientStore.hpp | 2 | ||||
| -rw-r--r-- | include/ingen/client/PortModel.hpp | 2 | ||||
| -rw-r--r-- | include/ingen/client/SigClientInterface.hpp | 6 | ||||
| -rw-r--r-- | include/ingen/client/ThreadedSigClientInterface.hpp | 6 |
5 files changed, 10 insertions, 9 deletions
diff --git a/include/ingen/ClientInterface.hpp b/include/ingen/ClientInterface.hpp index fc212850..a2086926 100644 --- a/include/ingen/ClientInterface.hpp +++ b/include/ingen/ClientInterface.hpp @@ -48,7 +48,8 @@ public: virtual void error(const std::string& msg) = 0; - virtual void activity(const Raul::Path& path) = 0; + virtual void activity(const Raul::Path& path, + const Raul::Atom& value) = 0; }; } // namespace Ingen diff --git a/include/ingen/client/ClientStore.hpp b/include/ingen/client/ClientStore.hpp index 05576cdc..a2cb5346 100644 --- a/include/ingen/client/ClientStore.hpp +++ b/include/ingen/client/ClientStore.hpp @@ -121,7 +121,7 @@ private: void bundle_end() {} // Slots for SigClientInterface signals - void activity(const Raul::Path& path); + void activity(const Raul::Path& path, const Raul::Atom& value); bool attempt_connection(const Raul::Path& src_port_path, const Raul::Path& dst_port_path); diff --git a/include/ingen/client/PortModel.hpp b/include/ingen/client/PortModel.hpp index 36ab847f..f3e8f319 100644 --- a/include/ingen/client/PortModel.hpp +++ b/include/ingen/client/PortModel.hpp @@ -80,7 +80,7 @@ public: // Signals INGEN_SIGNAL(value_changed, void, const Raul::Atom&); INGEN_SIGNAL(voice_changed, void, uint32_t, const Raul::Atom&); - INGEN_SIGNAL(activity, void); + INGEN_SIGNAL(activity, void, const Raul::Atom&); INGEN_SIGNAL(connection, void, SharedPtr<PortModel>); INGEN_SIGNAL(disconnection, void, SharedPtr<PortModel>); diff --git a/include/ingen/client/SigClientInterface.hpp b/include/ingen/client/SigClientInterface.hpp index 2241425b..ae42b169 100644 --- a/include/ingen/client/SigClientInterface.hpp +++ b/include/ingen/client/SigClientInterface.hpp @@ -61,7 +61,7 @@ public: INGEN_SIGNAL(variable_change, void, Raul::URI, Raul::URI, Raul::Atom) INGEN_SIGNAL(property_change, void, Raul::URI, Raul::URI, Raul::Atom) INGEN_SIGNAL(port_value, void, Raul::Path, Raul::Atom) - INGEN_SIGNAL(activity, void, Raul::Path) + INGEN_SIGNAL(activity, void, Raul::Path, Raul::Atom) /** Fire pending signals. Only does anything on derived classes (that may queue) */ virtual bool emit_signals() { return false; } @@ -115,8 +115,8 @@ protected: void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value) { EMIT(property_change, subject, key, value); } - void activity(const Raul::Path& port_path) - { EMIT(activity, port_path); } + void activity(const Raul::Path& port_path, const Raul::Atom& value) + { EMIT(activity, port_path, value); } }; } // namespace Client diff --git a/include/ingen/client/ThreadedSigClientInterface.hpp b/include/ingen/client/ThreadedSigClientInterface.hpp index c30b62da..64901e8f 100644 --- a/include/ingen/client/ThreadedSigClientInterface.hpp +++ b/include/ingen/client/ThreadedSigClientInterface.hpp @@ -113,8 +113,8 @@ public: void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value) { push_sig(sigc::bind(property_change_slot, subject, key, value)); } - void activity(const Raul::Path& port_path) - { push_sig(sigc::bind(activity_slot, port_path)); } + void activity(const Raul::Path& port_path, const Raul::Atom& value) + { push_sig(sigc::bind(activity_slot, port_path, value)); } /** Process all queued events - Called from GTK thread to emit signals. */ bool emit_signals(); @@ -146,7 +146,7 @@ private: sigc::slot<void, Raul::URI, Raul::URI, Raul::Atom> variable_change_slot; sigc::slot<void, Raul::URI, Raul::URI, Raul::Atom> property_change_slot; sigc::slot<void, Raul::Path, Raul::Atom> port_value_slot; - sigc::slot<void, Raul::Path> activity_slot; + sigc::slot<void, Raul::Path, Raul::Atom> activity_slot; }; } // namespace Client |