Replace imperative polyphony/polyphonic stuff with properties (kill more API).

git-svn-id: http://svn.drobilla.net/lad/ingen@1412 a436a847-0d15-0410-975c-d299462d15a1

16 files changed, 96 insertions, 153 deletions

diff --git a/src/libs/client/ClientStore.cpp b/src/libs/client/ClientStore.cpp
index 1fb00eea..969f3a8f 100644
--- a/src/libs/client/ClientStore.cpp
+++ b/src/libs/client/ClientStore.cpp
@@ -42,8 +42,6 @@ ClientStore::ClientStore(SharedPtr<EngineInterface> engine, SharedPtr<SigClientI
 	emitter->signal_new_patch.connect(sigc::mem_fun(this, &ClientStore::new_patch_event));
 	emitter->signal_new_node.connect(sigc::mem_fun(this, &ClientStore::new_node_event));
 	emitter->signal_new_port.connect(sigc::mem_fun(this, &ClientStore::new_port_event));
-	emitter->signal_polyphonic.connect(sigc::mem_fun(this, &ClientStore::polyphonic_event));
-	emitter->signal_patch_polyphony.connect(sigc::mem_fun(this, &ClientStore::patch_polyphony_event));
 	emitter->signal_patch_cleared.connect(sigc::mem_fun(this, &ClientStore::patch_cleared_event));
 	emitter->signal_connection.connect(sigc::mem_fun(this, &ClientStore::connection_event));
 	emitter->signal_disconnection.connect(sigc::mem_fun(this, &ClientStore::disconnection_event));
@@ -417,14 +415,14 @@ ClientStore::new_patch_event(const Path& path, uint32_t poly)
 
 
 void
-ClientStore::new_node_event(const Path& path, const string& plugin_uri, bool polyphonic)
+ClientStore::new_node_event(const Path& path, const string& plugin_uri)
 {
 	SharedPtr<PluginModel> plug = plugin(plugin_uri);
 	if (!plug) {
-		SharedPtr<NodeModel> n(new NodeModel(plugin_uri, path, polyphonic));
+		SharedPtr<NodeModel> n(new NodeModel(plugin_uri, path));
 		add_plugin_orphan(n);
 	} else {
-		SharedPtr<NodeModel> n(new NodeModel(plug, path, polyphonic));
+		SharedPtr<NodeModel> n(new NodeModel(plug, path));
 		add_object(n);
 	}
 }
@@ -441,24 +439,6 @@ ClientStore::new_port_event(const Path& path, uint32_t index, const string& type
 		resolve_connection_orphans(p);
 }
 
-	
-void
-ClientStore::polyphonic_event(const Path& path, bool polyphonic)
-{
-	SharedPtr<ObjectModel> object = this->object(path);
-	if (object)
-		object->set_polyphonic(polyphonic);
-}
-
-
-void
-ClientStore::patch_polyphony_event(const Path& path, uint32_t poly)
-{
-	SharedPtr<PatchModel> patch = PtrCast<PatchModel>(object(path));
-	if (patch)
-		patch->poly(poly);
-}
-
 
 void
 ClientStore::patch_cleared_event(const Path& path)
diff --git a/src/libs/client/ClientStore.hpp b/src/libs/client/ClientStore.hpp
index e1b3adaa..a750f875 100644
--- a/src/libs/client/ClientStore.hpp
+++ b/src/libs/client/ClientStore.hpp
@@ -98,10 +98,8 @@ private:
 	void rename_event(const Path& old_path, const Path& new_path);
 	void new_plugin_event(const string& uri, const string& type_uri, const string& symbol, const string& name);
 	void new_patch_event(const Path& path, uint32_t poly);
-	void new_node_event(const Path& path, const string& plugin_uri, bool polyphonic);
+	void new_node_event(const Path& path, const string& plugin_uri);
 	void new_port_event(const Path& path, uint32_t index, const string& data_type, bool is_output);
-	void polyphonic_event(const Path& path, bool polyphonic);
-	void patch_polyphony_event(const Path& path, uint32_t poly);
 	void patch_cleared_event(const Path& path);
 	void variable_change_event(const Path& subject_path, const string& predicate, const Atom& value);
 	void property_change_event(const Path& subject_path, const string& predicate, const Atom& value);
diff --git a/src/libs/client/DeprecatedLoader.cpp b/src/libs/client/DeprecatedLoader.cpp
index 3ed6bc5f..6ec1db81 100644
--- a/src/libs/client/DeprecatedLoader.cpp
+++ b/src/libs/client/DeprecatedLoader.cpp
@@ -519,9 +519,11 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
 			}
 
 			if (plugin_uri != "")
-				_engine->new_node(path, plugin_uri, polyphonic);
+				_engine->new_node(path, plugin_uri);
 			else
-				_engine->new_node_deprecated(path, plugin_type, library_name, plugin_label, polyphonic);
+				_engine->new_node_deprecated(path, plugin_type, library_name, plugin_label);
+
+			_engine->set_property(path, "ingen:polyphonic", polyphonic);
 		
 			for (GraphObject::Variables::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i)
 				_engine->set_variable(path, i->first, i->second);
@@ -531,7 +533,8 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
 
 	// Not deprecated
 	} else {
-		_engine->new_node(path, plugin_uri, polyphonic);
+		_engine->new_node(path, plugin_uri);
+		_engine->set_property(path, "ingen:polyphonic", polyphonic);
 		for (GraphObject::Variables::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i)
 			_engine->set_variable(path, i->first, i->second);
 		return true;
diff --git a/src/libs/client/NodeModel.cpp b/src/libs/client/NodeModel.cpp
index 96d70663..45d7cffe 100644
--- a/src/libs/client/NodeModel.cpp
+++ b/src/libs/client/NodeModel.cpp
@@ -27,8 +27,8 @@ namespace Ingen {
 namespace Client {
 
 
-NodeModel::NodeModel(SharedPtr<PluginModel> plugin, const Path& path, bool polyphonic)
-	: ObjectModel(path, polyphonic)
+NodeModel::NodeModel(SharedPtr<PluginModel> plugin, const Path& path)
+	: ObjectModel(path)
 	, _plugin_uri(plugin->uri())
 	, _plugin(plugin)
 	, _min_values(0)
@@ -36,8 +36,8 @@ NodeModel::NodeModel(SharedPtr<PluginModel> plugin, const Path& path, bool polyp
 {
 }
 
-NodeModel::NodeModel(const string& plugin_uri, const Path& path, bool polyphonic)
-	: ObjectModel(path, polyphonic)
+NodeModel::NodeModel(const string& plugin_uri, const Path& path)
+	: ObjectModel(path)
 	, _plugin_uri(plugin_uri)
 	, _min_values(0)
 	, _max_values(0)
diff --git a/src/libs/client/NodeModel.hpp b/src/libs/client/NodeModel.hpp
index 08e106ab..1f212b6b 100644
--- a/src/libs/client/NodeModel.hpp
+++ b/src/libs/client/NodeModel.hpp
@@ -68,8 +68,8 @@ public:
 protected:
 	friend class ClientStore;
 	
-	NodeModel(const string& plugin_uri, const Path& path, bool polyphonic);
-	NodeModel(SharedPtr<PluginModel> plugin, const Path& path, bool polyphonic);
+	NodeModel(const string& plugin_uri, const Path& path);
+	NodeModel(SharedPtr<PluginModel> plugin, const Path& path);
 
 	NodeModel(const Path& path);
 	void add_child(SharedPtr<ObjectModel> c);
diff --git a/src/libs/client/OSCClientReceiver.cpp b/src/libs/client/OSCClientReceiver.cpp
index 6087736f..5f12cd6e 100644
--- a/src/libs/client/OSCClientReceiver.cpp
+++ b/src/libs/client/OSCClientReceiver.cpp
@@ -145,16 +145,12 @@ OSCClientReceiver::setup_callbacks()
 	lo_server_thread_add_method(_st, "/ingen/plugin", "ssss", plugin_cb, this);
 	lo_server_thread_add_method(_st, "/ingen/new_patch", "si", new_patch_cb, this);
 	lo_server_thread_add_method(_st, "/ingen/destroyed", "s", destroyed_cb, this);
-	lo_server_thread_add_method(_st, "/ingen/patch_polyphony", "si", patch_polyphony_cb, this);
 	lo_server_thread_add_method(_st, "/ingen/patch_cleared", "s", patch_cleared_cb, this);
 	lo_server_thread_add_method(_st, "/ingen/object_renamed", "ss", object_renamed_cb, this);
 	lo_server_thread_add_method(_st, "/ingen/new_connection", "ss", connection_cb, this);
 	lo_server_thread_add_method(_st, "/ingen/disconnection", "ss", disconnection_cb, this);
-	lo_server_thread_add_method(_st, "/ingen/new_node", "ssT", new_node_cb, this);
-	lo_server_thread_add_method(_st, "/ingen/new_node", "ssF", new_node_cb, this);
+	lo_server_thread_add_method(_st, "/ingen/new_node", "ss", new_node_cb, this);
 	lo_server_thread_add_method(_st, "/ingen/new_port", "sisi", new_port_cb, this);
-	lo_server_thread_add_method(_st, "/ingen/polyphonic", "sT", polyphonic_cb, this);
-	lo_server_thread_add_method(_st, "/ingen/polyphonic", "sF", polyphonic_cb, this);
 	lo_server_thread_add_method(_st, "/ingen/set_variable", NULL, set_variable_cb, this);
 	lo_server_thread_add_method(_st, "/ingen/set_property", NULL, set_property_cb, this);
 	lo_server_thread_add_method(_st, "/ingen/set_port_value", "sf", set_port_value_cb, this);
@@ -192,14 +188,6 @@ OSCClientReceiver::_destroyed_cb(const char* path, const char* types, lo_arg** a
 
 
 int
-OSCClientReceiver::_patch_polyphony_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
-{
-	patch_polyphony((const char*)&argv[0]->s, argv[1]->i);
-	return 0;
-}
-
-
-int
 OSCClientReceiver::_patch_cleared_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
 {
 	patch_cleared((const char*)&argv[0]->s);
@@ -246,9 +234,8 @@ OSCClientReceiver::_new_node_cb(const char* path, const char* types, lo_arg** ar
 {
 	const char*   uri        = &argv[0]->s;
 	const char*   node_path  = &argv[1]->s;
-	const bool    polyphonic = (types[2] == 'T');
 
-	new_node(uri, node_path, polyphonic);
+	new_node(uri, node_path);
 
 	return 0;
 }
@@ -270,20 +257,6 @@ OSCClientReceiver::_new_port_cb(const char* path, const char* types, lo_arg** ar
 }
 
 
-/** Notification of an object's polyphonic flag
- */
-int
-OSCClientReceiver::_polyphonic_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
-{
-	const char* obj_path = &argv[0]->s;
-	const bool  poly     = (types[1] == 'T');
-
-	polyphonic(obj_path, poly);
-
-	return 0;	
-}
-
-
 /** Notification of a new or updated variable.
  */
 int
diff --git a/src/libs/client/OSCClientReceiver.hpp b/src/libs/client/OSCClientReceiver.hpp
index 9950df7d..eb1efd21 100644
--- a/src/libs/client/OSCClientReceiver.hpp
+++ b/src/libs/client/OSCClientReceiver.hpp
@@ -86,14 +86,12 @@ private:
 	LO_HANDLER(plugin_list_end);
 	LO_HANDLER(new_patch);
 	LO_HANDLER(destroyed);
-	LO_HANDLER(patch_polyphony);
 	LO_HANDLER(patch_cleared);
 	LO_HANDLER(object_renamed);
 	LO_HANDLER(connection);
 	LO_HANDLER(disconnection);
 	LO_HANDLER(new_node);
 	LO_HANDLER(new_port);
-	LO_HANDLER(polyphonic);
 	LO_HANDLER(set_variable);
 	LO_HANDLER(set_property);
 	LO_HANDLER(set_port_value);
diff --git a/src/libs/client/OSCEngineSender.cpp b/src/libs/client/OSCEngineSender.cpp
index d235e7a9..22f0ce86 100644
--- a/src/libs/client/OSCEngineSender.cpp
+++ b/src/libs/client/OSCEngineSender.cpp
@@ -156,22 +156,14 @@ OSCEngineSender::new_port(const string& path,
 
 void
 OSCEngineSender::new_node(const string& path,
-                          const string& plugin_uri,
-                          bool          polyphonic)
+                          const string& plugin_uri)
 {
 
-	if (polyphonic)
-		send("/ingen/new_node",  "issT",
-			next_id(),
-			path.c_str(),
-			plugin_uri.c_str(),
-			LO_ARGS_END);
-	else
-		send("/ingen/new_node",  "issF",
-			next_id(),
-			path.c_str(),
-			plugin_uri.c_str(),
-			LO_ARGS_END);
+	send("/ingen/new_node",  "iss",
+		next_id(),
+		path.c_str(),
+		plugin_uri.c_str(),
+		LO_ARGS_END);
 }
 
 
@@ -183,25 +175,15 @@ void
 OSCEngineSender::new_node_deprecated(const string& path,
                                      const string& plugin_type,
                                      const string& library_name,
-                                     const string& plugin_label,
-                                     bool          polyphonic)
+                                     const string& plugin_label)
 {
-	if (polyphonic)
-		send("/ingen/new_node",  "issssT",
-			next_id(),
-			path.c_str(),
-			plugin_type.c_str(),
-			library_name.c_str(),
-			plugin_label.c_str(),
-			LO_ARGS_END);
-	else
-		send("/ingen/new_node",  "issssF",
-			next_id(),
-			path.c_str(),
-			plugin_type.c_str(),
-			library_name.c_str(),
-			plugin_label.c_str(),
-			LO_ARGS_END);
+	send("/ingen/new_node",  "issss",
+		next_id(),
+		path.c_str(),
+		plugin_type.c_str(),
+		library_name.c_str(),
+		plugin_label.c_str(),
+		LO_ARGS_END);
 }
 
 
@@ -459,6 +441,7 @@ OSCEngineSender::request_port_value(const string& port_path)
 		LO_ARGS_END);
 }
 
+
 void
 OSCEngineSender::request_variable(const string& object_path, const string& key)
 {
@@ -469,6 +452,17 @@ OSCEngineSender::request_variable(const string& object_path, const string& key)
 		LO_ARGS_END);
 }
 
+	
+void
+OSCEngineSender::request_property(const string& object_path, const string& key)
+{
+	send("/ingen/request_property", "iss",
+		next_id(),
+		object_path.c_str(),
+		key.c_str(),
+		LO_ARGS_END);
+}
+
 
 void
 OSCEngineSender::request_plugins()
diff --git a/src/libs/client/OSCEngineSender.hpp b/src/libs/client/OSCEngineSender.hpp
index 985e1db3..771a7232 100644
--- a/src/libs/client/OSCEngineSender.hpp
+++ b/src/libs/client/OSCEngineSender.hpp
@@ -86,14 +86,12 @@ public:
 	              bool          is_output);
 
 	void new_node(const string& path,
-	              const string& plugin_uri,
-	              bool          polyphonic);
+	              const string& plugin_uri);
 	
 	void new_node_deprecated(const string& path,
 	                         const string& plugin_type,
 	                         const string& library_name,
-	                         const string& plugin_label,
-	                         bool          polyphonic);
+	                         const string& plugin_label);
 
 	void rename(const string& old_path,
 	            const string& new_name);
@@ -148,19 +146,13 @@ public:
 	                  const Raul::Atom& value);
 	
 	// Requests //
-	
 	void ping();
-
 	void request_plugin(const string& uri);
-
 	void request_object(const string& path);
-
 	void request_port_value(const string& port_path);
-	
 	void request_variable(const string& path, const string& key);
-
+	void request_property(const string& path, const string& key);
 	void request_plugins();
-
 	void request_all_objects();
 
 protected:
diff --git a/src/libs/client/ObjectModel.cpp b/src/libs/client/ObjectModel.cpp
index c807797e..c9236c9e 100644
--- a/src/libs/client/ObjectModel.cpp
+++ b/src/libs/client/ObjectModel.cpp
@@ -26,9 +26,8 @@ namespace Ingen {
 namespace Client {
 
 
-ObjectModel::ObjectModel(const Path& path, bool polyphonic)
+ObjectModel::ObjectModel(const Path& path)
 	: _path(path)
-	, _polyphonic(polyphonic)
 {
 }
 
@@ -38,7 +37,7 @@ ObjectModel::~ObjectModel()
 }
 	
 
-/** Get a piece of variable for this object.
+/** Get a variable for this object.
  *
  * @return Metadata value with key @a key, empty string otherwise.
  */
@@ -55,11 +54,28 @@ ObjectModel::get_variable(const string& key) const
 }
 
 
-void
-ObjectModel::set_polyphonic(bool polyphonic)
+/** Get a property of this object.
+ *
+ * @return Metadata value with key @a key, empty string otherwise.
+ */
+const Atom&
+ObjectModel::get_property(const string& key) const
+{
+	static const Atom null_atom;
+
+	Variables::const_iterator i = _properties.find(key);
+	if (i != _properties.end())
+		return i->second;
+	else
+		return null_atom;
+}
+
+
+bool
+ObjectModel::polyphonic() const
 {
-	_polyphonic = polyphonic;
-	signal_polyphonic.emit(polyphonic);
+	Variables::const_iterator i = _properties.find("ingen:polyphonic");
+	return (i != _properties.end() && i->second.type() == Atom::BOOL && i->second.get_bool());
 }
 
 
diff --git a/src/libs/client/ObjectModel.hpp b/src/libs/client/ObjectModel.hpp
index 460d7d9d..b0796275 100644
--- a/src/libs/client/ObjectModel.hpp
+++ b/src/libs/client/ObjectModel.hpp
@@ -60,10 +60,12 @@ public:
 	virtual ~ObjectModel();
 
 	const Atom& get_variable(const string& key) const;
-	void set_variable(const string& key, const Atom& value)
+	const Atom& get_property(const string& key) const;
+	
+	virtual void set_variable(const string& key, const Atom& value)
 		{ _variables[key] = value; signal_variable.emit(key, value); }
 	
-	void set_property(const string& key, const Atom& value)
+	virtual void set_property(const string& key, const Atom& value)
 		{ _properties[key] = value; signal_property.emit(key, value); }
 
 	const Variables&       variables()  const { return _variables; }
@@ -71,7 +73,7 @@ public:
 	const Path             path()       const { return _path; }
 	const Symbol           symbol()     const { return _path.name(); }
 	SharedPtr<ObjectModel> parent()     const { return _parent; }
-	bool                   polyphonic() const { return _polyphonic; }
+	bool                   polyphonic() const;
 	
 	GraphObject* graph_parent() const { return _parent.get(); }
 
@@ -80,26 +82,22 @@ public:
 	sigc::signal<void, SharedPtr<ObjectModel> >    signal_removed_child; 
 	sigc::signal<void, const string&, const Atom&> signal_variable; 
 	sigc::signal<void, const string&, const Atom&> signal_property; 
-	sigc::signal<void, bool>                       signal_polyphonic; 
 	sigc::signal<void>                             signal_destroyed; 
 	sigc::signal<void>                             signal_renamed; 
 
 protected:
 	friend class ClientStore;
 	
-	ObjectModel(const Path& path, bool polyphonic);
+	ObjectModel(const Path& path);
 	
 	virtual void set_path(const Path& p) { _path = p; signal_renamed.emit(); }
 	virtual void set_parent(SharedPtr<ObjectModel> p) { assert(p); _parent = p; }
 	virtual void add_child(SharedPtr<ObjectModel> c) {}
 	virtual bool remove_child(SharedPtr<ObjectModel> c) { return true; }
 
-	void set_polyphonic(bool);
-	
 	virtual void set(SharedPtr<ObjectModel> model);
 
 	Path                   _path;
-	bool                   _polyphonic;
 	SharedPtr<ObjectModel> _parent;
 	
 	Variables _variables;
diff --git a/src/libs/client/PatchModel.cpp b/src/libs/client/PatchModel.cpp
index 38019eda..4fe0e641 100644
--- a/src/libs/client/PatchModel.cpp
+++ b/src/libs/client/PatchModel.cpp
@@ -166,6 +166,15 @@ PatchModel::enabled() const
 	Variables::const_iterator i = _properties.find("ingen:enabled");
 	return (i != _properties.end() && i->second.type() == Atom::BOOL && i->second.get_bool());
 }
+	
+
+void
+PatchModel::set_property(const string& key, const Atom& value)
+{
+	ObjectModel::set_property(key, value);
+	if (key == "ingen:polyphony")
+		_poly = value.get_int32();
+}
 
 
 bool
diff --git a/src/libs/client/PatchModel.hpp b/src/libs/client/PatchModel.hpp
index e39ee2f7..8c60e884 100644
--- a/src/libs/client/PatchModel.hpp
+++ b/src/libs/client/PatchModel.hpp
@@ -48,7 +48,7 @@ public:
 	SharedPtr<ConnectionModel> get_connection(const string& src_port_path,
 	                                          const string& dst_port_path) const;
 	
-	size_t   poly()               const { return _poly; }
+	uint32_t poly()               const { return _poly; }
 	uint32_t internal_polyphony() const { return _poly; }
 	bool     enabled()            const;
 	bool     polyphonic()         const;
@@ -61,6 +61,8 @@ public:
 		_editable = e;
 		signal_editable.emit(e);
 	} }
+	
+	virtual void set_property(const string& key, const Atom& value);
 
 	static unsigned child_name_offset(ClientStore& store,
 	                                  SharedPtr<PatchModel> parent,
@@ -71,20 +73,18 @@ public:
 	sigc::signal<void, SharedPtr<NodeModel> >       signal_removed_node; 
 	sigc::signal<void, SharedPtr<ConnectionModel> > signal_new_connection; 
 	sigc::signal<void, SharedPtr<ConnectionModel> > signal_removed_connection;
-	sigc::signal<void, uint32_t>                    signal_polyphony;
 	sigc::signal<void, bool>                        signal_editable;
 
 private:
 	friend class ClientStore;
 
 	PatchModel(const Path& patch_path, size_t internal_poly)
-		: NodeModel("ingen:Patch", patch_path, false) // FIXME
+		: NodeModel("ingen:Patch", patch_path)
 		, _poly(internal_poly)
 		, _editable(true)
 	{
 	}
 	
-	void poly(size_t p) { _poly = p; signal_polyphony.emit(p); }
 	void clear();
 	void add_child(SharedPtr<ObjectModel> c);
 	bool remove_child(SharedPtr<ObjectModel> c);
diff --git a/src/libs/client/PortModel.hpp b/src/libs/client/PortModel.hpp
index 3739be58..8fa18f1c 100644
--- a/src/libs/client/PortModel.hpp
+++ b/src/libs/client/PortModel.hpp
@@ -74,7 +74,7 @@ private:
 	friend class ClientStore;
 	
 	PortModel(const Path& path, uint32_t index, DataType type, Direction dir)
-		: ObjectModel(path, true)
+		: ObjectModel(path)
 		, _index(index)
 		, _type(type)
 		, _direction(dir)
diff --git a/src/libs/client/SigClientInterface.hpp b/src/libs/client/SigClientInterface.hpp
index 6318f440..dbedd79c 100644
--- a/src/libs/client/SigClientInterface.hpp
+++ b/src/libs/client/SigClientInterface.hpp
@@ -54,10 +54,8 @@ public:
 	sigc::signal<void, uint32_t>                           signal_num_plugins; 
 	sigc::signal<void, string, string, string, string>     signal_new_plugin; 
 	sigc::signal<void, string, uint32_t>                   signal_new_patch; 
-	sigc::signal<void, string, string, bool>               signal_new_node; 
+	sigc::signal<void, string, string>                     signal_new_node; 
 	sigc::signal<void, string, uint32_t, string, bool>     signal_new_port; 
-	sigc::signal<void, string, bool>                       signal_polyphonic; 
-	sigc::signal<void, string, uint32_t>                   signal_patch_polyphony; 
 	sigc::signal<void, string>                             signal_patch_cleared; 
 	sigc::signal<void, string, string>                     signal_object_renamed; 
 	sigc::signal<void, string>                             signal_object_destroyed; 
@@ -109,24 +107,18 @@ protected:
 	void new_patch(const string& path, uint32_t poly)
 		{ if (_enabled) signal_new_patch.emit(path, poly); }
 	
-	void new_node(const string& path, const string& plugin_uri, bool poly)
-		{ if (_enabled) signal_new_node.emit(path, plugin_uri, poly); }
+	void new_node(const string& path, const string& plugin_uri)
+		{ if (_enabled) signal_new_node.emit(path, plugin_uri); }
 	
 	void new_port(const string& path, uint32_t index, const string& data_type, bool is_output)
 		{ if (_enabled) signal_new_port.emit(path, index, data_type, is_output); }
 	
-	void polyphonic(const string& path, bool polyphonic)
-		{ if (_enabled) signal_polyphonic.emit(path, polyphonic); }
-
 	void connect(const string& src_port_path, const string& dst_port_path)
 		{ if (_enabled) signal_connection.emit(src_port_path, dst_port_path); }
 
 	void object_destroyed(const string& path)
 		{ if (_enabled) signal_object_destroyed.emit(path); }
 	
-	void patch_polyphony(const string& path, uint32_t poly)
-		{ if (_enabled) signal_patch_polyphony.emit(path, poly); }
-
 	void patch_cleared(const string& path)
 		{ if (_enabled) signal_patch_cleared.emit(path); }
 
diff --git a/src/libs/client/ThreadedSigClientInterface.hpp b/src/libs/client/ThreadedSigClientInterface.hpp
index 291df426..fb6eb447 100644
--- a/src/libs/client/ThreadedSigClientInterface.hpp
+++ b/src/libs/client/ThreadedSigClientInterface.hpp
@@ -54,9 +54,7 @@ public:
 	, new_patch_slot(signal_new_patch.make_slot())
 	, new_node_slot(signal_new_node.make_slot())
 	, new_port_slot(signal_new_port.make_slot())
-	, polyphonic_slot(signal_polyphonic.make_slot())
 	, connection_slot(signal_connection.make_slot())
-	, patch_polyphony_slot(signal_patch_polyphony.make_slot())
 	, patch_cleared_slot(signal_patch_cleared.make_slot())
 	, object_destroyed_slot(signal_object_destroyed.make_slot())
 	, object_renamed_slot(signal_object_renamed.make_slot())
@@ -99,24 +97,18 @@ public:
 	void new_patch(const string& path, uint32_t poly)
 		{ push_sig(sigc::bind(new_patch_slot, path, poly)); }
 	
-	void new_node(const string& path, const string& plugin_uri, bool polyphonic)
-		{ push_sig(sigc::bind(new_node_slot, path, plugin_uri, polyphonic)); }
+	void new_node(const string& path, const string& plugin_uri)
+		{ push_sig(sigc::bind(new_node_slot, path, plugin_uri)); }
 	
 	void new_port(const string& path, uint32_t index,  const string& data_type, bool is_output)
 		{ push_sig(sigc::bind(new_port_slot, path, index, data_type, is_output)); }
 	
-	void polyphonic(const string& path, bool polyphonic)
-		{ push_sig(sigc::bind(polyphonic_slot, path, polyphonic)); }
-
 	void connect(const string& src_port_path, const string& dst_port_path)
 		{ push_sig(sigc::bind(connection_slot, src_port_path, dst_port_path)); }
 
 	void object_destroyed(const string& path)
 		{ push_sig(sigc::bind(object_destroyed_slot, path)); }
 	
-	void patch_polyphony(const string& path, uint32_t poly)
-		{ push_sig(sigc::bind(patch_polyphony_slot, path, poly)); }
-
 	void patch_cleared(const string& path)
 		{ push_sig(sigc::bind(patch_cleared_slot, path)); }
 
@@ -164,11 +156,9 @@ private:
 	sigc::slot<void, string>                             error_slot; 
 	sigc::slot<void, string, string, string, string>     new_plugin_slot; 
 	sigc::slot<void, string, uint32_t>                   new_patch_slot; 
-	sigc::slot<void, string, string, bool>               new_node_slot; 
+	sigc::slot<void, string, string>                     new_node_slot; 
 	sigc::slot<void, string, uint32_t, string, bool>     new_port_slot;
-	sigc::slot<void, string, bool>                       polyphonic_slot;
 	sigc::slot<void, string, string>                     connection_slot;
-	sigc::slot<void, string, uint32_t>                   patch_polyphony_slot; 
 	sigc::slot<void, string>                             patch_cleared_slot; 
 	sigc::slot<void, string>                             object_destroyed_slot; 
 	sigc::slot<void, string, string>                     object_renamed_slot;