From 119468f621a59d86da10bedf75c4427b70f9d370 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 16 Mar 2012 03:15:41 +0000
Subject: Remove activity from interface and use set_property() instead. Move
 client registration stuff to Engine and remove corresponding events. Simply
 response ID interface.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4066 a436a847-0d15-0410-975c-d299462d15a1
---
 ingen/client/ClientStore.hpp                |  2 --
 ingen/client/SigClientInterface.hpp         |  4 ----
 ingen/client/ThreadedSigClientInterface.hpp | 37 +++++++++++++----------------
 3 files changed, 16 insertions(+), 27 deletions(-)

(limited to 'ingen/client')

diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index b6042086..e29723ae 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -125,8 +125,6 @@ private:
 	void bundle_end()   {}
 
 	// Slots for SigClientInterface signals
-	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/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp
index 559d1b15..db59be9d 100644
--- a/ingen/client/SigClientInterface.hpp
+++ b/ingen/client/SigClientInterface.hpp
@@ -60,7 +60,6 @@ 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, Raul::Atom)
 
 	/** Fire pending signals.  Only does anything on derived classes (that may queue) */
 	virtual bool emit_signals() { return false; }
@@ -110,9 +109,6 @@ 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, const Raul::Atom& value)
-		{ EMIT(activity, port_path, value); }
 };
 
 } // namespace Client
diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp
index 6ded560e..2a33eae8 100644
--- a/ingen/client/ThreadedSigClientInterface.hpp
+++ b/ingen/client/ThreadedSigClientInterface.hpp
@@ -65,7 +65,6 @@ public:
 		, variable_change_slot(_signal_variable_change.make_slot())
 		, property_change_slot(_signal_property_change.make_slot())
 		, port_value_slot(_signal_port_value.make_slot())
-		, activity_slot(_signal_activity.make_slot())
 	{}
 
 	virtual Raul::URI uri() const { return "http://drobilla.net/ns/ingen#internal"; }
@@ -110,9 +109,6 @@ 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, 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();
 
@@ -124,25 +120,24 @@ private:
 
 	Raul::SRSWQueue<Closure> _sigs;
 
-	sigc::slot<void>                                              bundle_begin_slot;
-	sigc::slot<void>                                              bundle_end_slot;
-	sigc::slot<void, int32_t, Status>                             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::Path, Raul::URI, uint32_t, bool>       new_port_slot;
+	sigc::slot<void>                                        bundle_begin_slot;
+	sigc::slot<void>                                        bundle_end_slot;
+	sigc::slot<void, int32_t, Status>                       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::Path, Raul::URI, uint32_t, bool> new_port_slot;
 	sigc::slot<void, Raul::URI, Resource::Properties,
-	                            Resource::Graph>                  put_slot;
+	                            Resource::Graph>            put_slot;
 	sigc::slot<void, Raul::URI, Resource::Properties,
-	                            Resource::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;
-	sigc::slot<void, Raul::URI, Raul::URI>                        disconnection_slot;
-	sigc::slot<void, Raul::Path, Raul::Path>                      disconnect_all_slot;
-	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, Raul::Atom>                      activity_slot;
+	                            Resource::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;
+	sigc::slot<void, Raul::URI, Raul::URI>                  disconnection_slot;
+	sigc::slot<void, Raul::Path, Raul::Path>                disconnect_all_slot;
+	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;
 };
 
 } // namespace Client
-- 
cgit v1.2.1