Remove voice specific control setting.

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

28 files changed, 13 insertions, 352 deletions

diff --git a/src/bindings/Client.hpp b/src/bindings/Client.hpp
index fdb8d62c..f752a807 100644
--- a/src/bindings/Client.hpp
+++ b/src/bindings/Client.hpp
@@ -24,6 +24,5 @@ public:
 	void move(const Raul::Path& old_path, const Raul::Path& new_path) {}
 	void disconnect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path) {}
 	void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value) {}
-	void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value) {}
 	void activity(const Raul::Path& port_path) {}
 };
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index cf05e599..b12cdd7b 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -52,7 +52,6 @@ ClientStore::ClientStore(SharedPtr<EngineInterface> engine, SharedPtr<SigClientI
 	emitter->signal_connection.connect(sigc::mem_fun(this, &ClientStore::connect));
 	emitter->signal_disconnection.connect(sigc::mem_fun(this, &ClientStore::disconnect));
 	emitter->signal_property_change.connect(sigc::mem_fun(this, &ClientStore::set_property));
-	emitter->signal_voice_value.connect(sigc::mem_fun(this, &ClientStore::set_voice_value));
 	emitter->signal_activity.connect(sigc::mem_fun(this, &ClientStore::activity));
 }
 
@@ -386,17 +385,6 @@ ClientStore::set_property(const URI& subject_uri, const URI& predicate, const At
 
 
 void
-ClientStore::set_voice_value(const Path& port_path, uint32_t voice, const Atom& value)
-{
-	SharedPtr<PortModel> port = PtrCast<PortModel>(object(port_path));
-	if (port)
-		port->value(voice, value);
-	else
-		LOG(error) << "Polyphonic control change for non-existent port " << port_path << endl;
-}
-
-
-void
 ClientStore::activity(const Path& path)
 {
 	SharedPtr<PortModel> port = PtrCast<PortModel>(object(path));
diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp
index 978bc7d5..35dabdcf 100644
--- a/src/client/ClientStore.hpp
+++ b/src/client/ClientStore.hpp
@@ -73,7 +73,6 @@ public:
 			const Shared::Resource::Properties& add);
 	void move(const Raul::Path& old_path, const Raul::Path& new_path);
 	void set_property(const Raul::URI& subject_path, const Raul::URI& predicate, const Raul::Atom& value);
-	void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value);
 	void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path);
 	void disconnect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path);
 	void del(const Raul::Path& path);
diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp
index d515926b..f7400252 100644
--- a/src/client/HTTPEngineSender.cpp
+++ b/src/client/HTTPEngineSender.cpp
@@ -187,14 +187,6 @@ HTTPEngineSender::disconnect_all(const Path& parent_patch_path,
 
 
 void
-HTTPEngineSender::set_voice_value(const Path& port_path,
-                                  uint32_t    voice,
-                                  const Atom& value)
-{
-}
-
-
-void
 HTTPEngineSender::set_property(const URI&  subject,
                                const URI&  predicate,
                                const Atom& value)
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index 570ab3e9..6c7f7ed3 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -105,10 +105,6 @@ public:
 	                          const Raul::URI&  predicate,
 	                          const Raul::Atom& value);
 
-	virtual void set_voice_value(const Raul::Path& port_path,
-	                             uint32_t          voice,
-	                             const Raul::Atom& value);
-
 	// Requests //
 	void ping();
 	void get(const Raul::URI& uri);
diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp
index 4cf28156..fabfd925 100644
--- a/src/client/OSCClientReceiver.cpp
+++ b/src/client/OSCClientReceiver.cpp
@@ -149,7 +149,6 @@ OSCClientReceiver::setup_callbacks()
 	lo_server_thread_add_method(_st, "/connect", "ss", connection_cb, this);
 	lo_server_thread_add_method(_st, "/disconnect", "ss", disconnection_cb, this);
 	lo_server_thread_add_method(_st, "/set_property", NULL, set_property_cb, this);
-	lo_server_thread_add_method(_st, "/set_voice_value", "sif", set_voice_value_cb, this);
 	lo_server_thread_add_method(_st, "/activity", "s", activity_cb, this);
 }
 
@@ -236,19 +235,6 @@ OSCClientReceiver::_set_property_cb(const char* path, const char* types, lo_arg*
 
 
 int
-OSCClientReceiver::_set_voice_value_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
-{
-	const char* const port_path  = &argv[0]->s;
-	const int         voice      =  argv[1]->i;
-	const float       value      =  argv[2]->f;
-
-	_target->set_voice_value(port_path, voice, value);
-
-	return 0;
-}
-
-
-int
 OSCClientReceiver::_activity_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
 {
 	const char* const port_path = &argv[0]->s;
diff --git a/src/client/OSCClientReceiver.hpp b/src/client/OSCClientReceiver.hpp
index 31082858..de11a5e0 100644
--- a/src/client/OSCClientReceiver.hpp
+++ b/src/client/OSCClientReceiver.hpp
@@ -91,7 +91,6 @@ private:
 	LO_HANDLER(disconnection);
 	LO_HANDLER(put);
 	LO_HANDLER(set_property);
-	LO_HANDLER(set_voice_value);
 	LO_HANDLER(activity);
 };
 
diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp
index 30f5cb76..62ad94ec 100644
--- a/src/client/OSCEngineSender.cpp
+++ b/src/client/OSCEngineSender.cpp
@@ -217,22 +217,6 @@ OSCEngineSender::disconnect_all(const Path& parent_patch_path,
 
 
 void
-OSCEngineSender::set_voice_value(const Path& port_path,
-                                 uint32_t    voice,
-                                 const Atom& value)
-{
-	lo_message m = lo_message_new();
-	lo_message_add_int32(m, next_id());
-	lo_message_add_string(m, port_path.c_str());
-	lo_message_add_int32(m, voice);
-	if (value.type() == Atom::BLOB)
-		lo_message_add_string(m, value.get_blob_type());
-	Raul::AtomLiblo::lo_message_add_atom(m, value);
-	send_message("/set_port_value", m);
-}
-
-
-void
 OSCEngineSender::set_property(const URI&  subject,
                               const URI&  predicate,
                               const Atom& value)
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index 916d1466..538acad9 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -102,10 +102,6 @@ public:
 	                          const Raul::URI&  predicate,
 	                          const Raul::Atom& value);
 
-	virtual void set_voice_value(const Raul::Path& port_path,
-	                             uint32_t          voice,
-	                             const Raul::Atom& value);
-
 	// Requests //
 	void ping();
 	void get(const Raul::URI& uri);
diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp
index 3334c5c7..2637e7a2 100644
--- a/src/client/SigClientInterface.hpp
+++ b/src/client/SigClientInterface.hpp
@@ -60,7 +60,6 @@ public:
 	sigc::signal<void, Raul::URI, Raul::URI, Raul::Atom>            signal_variable_change;
 	sigc::signal<void, Raul::URI, Raul::URI, Raul::Atom>            signal_property_change;
 	sigc::signal<void, Raul::Path, Raul::Atom>                      signal_port_value;
-	sigc::signal<void, Raul::Path, uint32_t, Raul::Atom>            signal_voice_value;
 	sigc::signal<void, Raul::Path>                                  signal_activity;
 
 	/** Fire pending signals.  Only does anything on derived classes (that may queue) */
@@ -112,9 +111,6 @@ protected:
 	void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value)
 		{ EMIT(property_change, subject, key, value); }
 
-	void set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value)
-		{ EMIT(voice_value, port_path, voice, value); }
-
 	void activity(const Raul::Path& port_path)
 		{ EMIT(activity, port_path); }
 };
diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp
index bb86d65a..6a9cffdd 100644
--- a/src/client/ThreadedSigClientInterface.hpp
+++ b/src/client/ThreadedSigClientInterface.hpp
@@ -105,9 +105,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 set_voice_value(const Raul::Path& port_path, uint32_t voice, const Raul::Atom& value)
-		{ push_sig(sigc::bind(voice_value_slot, port_path, voice, value)); }
-
 	void activity(const Raul::Path& port_path)
 		{ push_sig(sigc::bind(activity_slot, port_path)); }
 
@@ -140,7 +137,6 @@ 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, uint32_t, Raul::Atom>            voice_value_slot;
 	sigc::slot<void, Raul::Path>                                  activity_slot;
 };
 
diff --git a/src/common/interface/CommonInterface.hpp b/src/common/interface/CommonInterface.hpp
index 3ee91f52..fa4859b3 100644
--- a/src/common/interface/CommonInterface.hpp
+++ b/src/common/interface/CommonInterface.hpp
@@ -66,10 +66,6 @@ public:
 	virtual void set_property(const Raul::URI&  subject,
 	                          const Raul::URI&  predicate,
 	                          const Raul::Atom& value) = 0;
-
-	virtual void set_voice_value(const Raul::Path& port_path,
-	                             uint32_t          voice,
-	                             const Raul::Atom& value) = 0;
 };
 
 
diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp
index 38073dc1..c72fef74 100644
--- a/src/engine/ClientBroadcaster.hpp
+++ b/src/engine/ClientBroadcaster.hpp
@@ -105,13 +105,6 @@ public:
 		BROADCAST(set_property, subject, predicate, value);
 	}
 
-	void set_voice_value(const Raul::Path& port_path,
-	                     uint32_t          voice,
-	                     const Raul::Atom& value) {
-		BROADCAST(set_voice_value, port_path, voice, value);
-	}
-
-
 	// ClientInterface
 
 	Raul::URI uri() const { return "http://drobilla.net/ns/ingen#broadcaster"; } ///< N/A
diff --git a/src/engine/HTTPClientSender.cpp b/src/engine/HTTPClientSender.cpp
index 996aa7cd..20bc8ee2 100644
--- a/src/engine/HTTPClientSender.cpp
+++ b/src/engine/HTTPClientSender.cpp
@@ -125,13 +125,6 @@ HTTPClientSender::set_property(const URI& subject, const URI& key, const Atom& v
 
 
 void
-HTTPClientSender::set_voice_value(const Path& port_path, uint32_t voice, const Atom& value)
-{
-	warn << "TODO: HTTP set voice value" << endl;
-}
-
-
-void
 HTTPClientSender::activity(const Path& path)
 {
 	const string msg = string(
diff --git a/src/engine/HTTPClientSender.hpp b/src/engine/HTTPClientSender.hpp
index dc4b9edf..c34decad 100644
--- a/src/engine/HTTPClientSender.hpp
+++ b/src/engine/HTTPClientSender.hpp
@@ -88,10 +88,6 @@ public:
 	                          const Raul::URI&  predicate,
 	                          const Raul::Atom& value);
 
-	virtual void set_voice_value(const Raul::Path& port_path,
-	                             uint32_t          voice,
-	                             const Raul::Atom& value);
-
 	virtual void activity(const Raul::Path& path);
 
 private:
diff --git a/src/engine/OSCClientSender.cpp b/src/engine/OSCClientSender.cpp
index c0f8e039..eec3923a 100644
--- a/src/engine/OSCClientSender.cpp
+++ b/src/engine/OSCClientSender.cpp
@@ -205,24 +205,6 @@ OSCClientSender::set_property(const URI& path, const URI& key, const Atom& value
 
 
 /** \page client_osc_namespace
- * <h2>/set_port_value</h2>
- * \arg \b path (string) - Path of port
- * \arg \b voice (int) - Voice which is set to this value
- * \arg \b value (any) - New value of port
- *
- * Notification the value of a port has changed.
- */
-void
-OSCClientSender::set_voice_value(const Path& port_path, uint32_t voice, const Atom& value)
-{
-	lo_message m = lo_message_new();
-	lo_message_add_string(m, port_path.c_str());
-	AtomLiblo::lo_message_add_atom(m, value);
-	send_message("/set_port_value", m);
-}
-
-
-/** \page client_osc_namespace
  * <h2>/activity</h2>
  * \arg \b path (string) - Path of object
  *
diff --git a/src/engine/OSCClientSender.hpp b/src/engine/OSCClientSender.hpp
index ca0783b0..fa6f1795 100644
--- a/src/engine/OSCClientSender.hpp
+++ b/src/engine/OSCClientSender.hpp
@@ -88,10 +88,6 @@ public:
 	                          const Raul::URI&  predicate,
 	                          const Raul::Atom& value);
 
-	virtual void set_voice_value(const Raul::Path& port_path,
-	                             uint32_t          voice,
-	                             const Raul::Atom& value);
-
 	virtual void activity(const Raul::Path& path);
 
 private:
diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp
index 6122c80d..58637d7c 100644
--- a/src/engine/QueuedEngineInterface.cpp
+++ b/src/engine/QueuedEngineInterface.cpp
@@ -217,15 +217,6 @@ QueuedEngineInterface::disconnect_all(const Path& patch_path,
 
 
 void
-QueuedEngineInterface::set_voice_value(const Path&       port_path,
-                                       uint32_t          voice,
-                                       const Raul::Atom& value)
-{
-	push_queued(new Events::SetPortValue(_engine, _request, true, now(), voice, port_path, value));
-}
-
-
-void
 QueuedEngineInterface::set_property(const URI&  uri,
                                     const URI&  predicate,
                                     const Atom& value)
diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp
index 8aa44f31..beaccb13 100644
--- a/src/engine/QueuedEngineInterface.hpp
+++ b/src/engine/QueuedEngineInterface.hpp
@@ -91,10 +91,6 @@ public:
 	                          const Raul::URI&  predicate,
 	                          const Raul::Atom& value);
 
-	virtual void set_voice_value(const Raul::Path& port_path,
-	                             uint32_t          voice,
-	                             const Raul::Atom& value);
-
 	virtual void del(const Raul::Path& path);
 
 	// EngineInterface object commands
diff --git a/src/engine/events/SendPortValue.cpp b/src/engine/events/SendPortValue.cpp
index 1d7d400d..e6bf7ad9 100644
--- a/src/engine/events/SendPortValue.cpp
+++ b/src/engine/events/SendPortValue.cpp
@@ -31,12 +31,9 @@ namespace Events {
 void
 SendPortValue::post_process()
 {
-	if (_omni) {
-		_engine.broadcaster()->set_property(_port->path(),
-				_engine.world()->uris->ingen_value, _value);
-	} else {
-		_engine.broadcaster()->set_voice_value(_port->path(), _voice_num, _value);
-	}
+	_engine.broadcaster()->set_property(
+			_port->path(),
+			_engine.world()->uris->ingen_value, _value);
 }
 
 
diff --git a/src/engine/events/SetPortValue.cpp b/src/engine/events/SetPortValue.cpp
index 8f8f331e..a43a37aa 100644
--- a/src/engine/events/SetPortValue.cpp
+++ b/src/engine/events/SetPortValue.cpp
@@ -47,7 +47,6 @@ namespace Events {
 using namespace Shared;
 
 
-/** Omni (all voices) control setting */
 SetPortValue::SetPortValue(Engine&            engine,
                            SharedPtr<Request> request,
                            bool               queued,
@@ -56,8 +55,6 @@ SetPortValue::SetPortValue(Engine&            engine,
                            const Raul::Atom&  value)
 	: QueuedEvent(engine, request, timestamp)
 	, _queued(queued)
-	, _omni(true)
-	, _voice_num(0)
 	, _port_path(port_path)
 	, _value(value)
 	, _port(NULL)
@@ -66,25 +63,6 @@ SetPortValue::SetPortValue(Engine&            engine,
 }
 
 
-/** Voice-specific control setting */
-SetPortValue::SetPortValue(Engine&            engine,
-                           SharedPtr<Request> request,
-                           bool               queued,
-                           SampleCount        timestamp,
-                           uint32_t           voice_num,
-                           const Raul::Path&  port_path,
-                           const Raul::Atom&  value)
-	: QueuedEvent(engine, request, timestamp)
-	, _queued(queued)
-	, _omni(false)
-	, _voice_num(voice_num)
-	, _port_path(port_path)
-	, _value(value)
-	, _port(NULL)
-	, _error(NO_ERROR)
-{
-}
-
 /** Internal */
 SetPortValue::SetPortValue(Engine&            engine,
                            SharedPtr<Request> request,
@@ -93,8 +71,6 @@ SetPortValue::SetPortValue(Engine&            engine,
                            const Raul::Atom&  value)
 	: QueuedEvent(engine, request, timestamp)
 	, _queued(false)
-	, _omni(true)
-	, _voice_num(0)
 	, _port_path(port->path())
 	, _value(value)
 	, _port(port)
@@ -170,16 +146,9 @@ SetPortValue::apply(Context& context)
 				return;
 			}
 
-			if (_omni) {
-				for (uint32_t v = 0; v < _port->poly(); ++v)
-					((AudioBuffer*)_port->buffer(v).get())->set_value(
-							_value.get_float(), start, _time);
-			} else {
-				if (_voice_num < _port->poly())
-					((AudioBuffer*)_port->buffer(_voice_num).get())->set_value(
-							_value.get_float(), start, _time);
-				else
-					_error = ILLEGAL_VOICE;
+			for (uint32_t v = 0; v < _port->poly(); ++v) {
+				((AudioBuffer*)_port->buffer(v).get())->set_value(
+						_value.get_float(), start, _time);
 			}
 			return;
 		}
@@ -232,21 +201,14 @@ SetPortValue::post_process()
 	case NO_ERROR:
 		assert(_port != NULL);
 		_request->respond_ok();
-		if (_omni)
-			_engine.broadcaster()->set_property(_port_path,
-					_engine.world()->uris->ingen_value, _value);
-		else
-			_engine.broadcaster()->set_voice_value(_port_path, _voice_num, _value);
+		_engine.broadcaster()->set_property(_port_path,
+				_engine.world()->uris->ingen_value, _value);
 		break;
 	case TYPE_MISMATCH:
 		ss << "Illegal value type " << _value.type()
 			<< " for port " << _port_path << endl;
 		_request->respond_error(ss.str());
 		break;
-	case ILLEGAL_VOICE:
-		ss << "Illegal voice number " << _voice_num;
-		_request->respond_error(ss.str());
-		break;
 	case PORT_NOT_FOUND:
 		msg = "Unable to find port ";
 		msg.append(_port_path.str()).append(" to set value");
diff --git a/src/engine/events/SetPortValue.hpp b/src/engine/events/SetPortValue.hpp
index d7a3d7ae..5d4265c7 100644
--- a/src/engine/events/SetPortValue.hpp
+++ b/src/engine/events/SetPortValue.hpp
@@ -50,14 +50,6 @@ public:
 
 	SetPortValue(Engine&              engine,
 	             SharedPtr<Request>   request,
-	             bool                 queued,
-	             SampleCount          timestamp,
-	             uint32_t             voice_num,
-	             const Raul::Path&    port_path,
-	             const Raul::Atom&    value);
-
-	SetPortValue(Engine&              engine,
-	             SharedPtr<Request>   request,
 	             SampleCount          timestamp,
 	             PortImpl*            port,
 	             const Raul::Atom&    value);
@@ -73,15 +65,12 @@ private:
 		NO_ERROR,
 		PORT_NOT_FOUND,
 		NO_SPACE,
-		ILLEGAL_VOICE,
 		TYPE_MISMATCH
 	};
 
 	void apply(Context& context);
 
 	bool             _queued;
-	bool             _omni;
-	uint32_t         _voice_num;
 	const Raul::Path _port_path;
 	const Raul::Atom _value;
 	PortImpl*        _port;
diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp
index 63361c45..eda1adc0 100644
--- a/src/gui/ControlPanel.cpp
+++ b/src/gui/ControlPanel.cpp
@@ -37,16 +37,6 @@ ControlPanel::ControlPanel(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Gl
 	, _callback_enabled(true)
 {
 	xml->get_widget("control_panel_controls_box", _control_box);
-	xml->get_widget("control_panel_voice_controls_box", _voice_control_box);
-	xml->get_widget("control_panel_all_voices_radio", _all_voices_radio);
-	xml->get_widget("control_panel_specific_voice_radio", _specific_voice_radio);
-	xml->get_widget("control_panel_voice_spinbutton", _voice_spinbutton);
-
-	_all_voices_radio->signal_toggled().connect(
-			sigc::mem_fun(this, &ControlPanel::all_voices_selected));
-
-	_specific_voice_radio->signal_toggled().connect(
-			sigc::mem_fun(this, &ControlPanel::specific_voice_selected));
 
 	show_all();
 }
@@ -65,24 +55,10 @@ ControlPanel::init(SharedPtr<NodeModel> node, uint32_t poly)
 	assert(node != NULL);
 	assert(poly > 0);
 
-	if (node->polyphonic()) {
-		_voice_spinbutton->set_range(0, poly - 1);
-		_voice_control_box->show();
-	} else {
-		_voice_control_box->hide();
-	}
-
 	for (NodeModel::Ports::const_iterator i = node->ports().begin(); i != node->ports().end(); ++i) {
 		add_port(*i);
 	}
 
-	node->signal_property.connect(
-			sigc::mem_fun(this, &ControlPanel::property_changed));
-
-	if (node->parent())
-		node->signal_property.connect(
-			sigc::mem_fun(this, &ControlPanel::parent_property_changed));
-
 	_callback_enabled = true;
 }
 
@@ -153,11 +129,6 @@ ControlPanel::add_port(SharedPtr<PortModel> pm)
 	_control_box->size_request(controls_size);
 	_ideal_size.first = controls_size.width;
 	_ideal_size.second = controls_size.height;
-
-	Gtk::Requisition voice_size;
-	_voice_control_box->size_request(voice_size);
-	_ideal_size.first += voice_size.width;
-	_ideal_size.second += voice_size.height;
 }
 
 
@@ -185,50 +156,10 @@ void
 ControlPanel::value_changed_atom(SharedPtr<PortModel> port, const Raul::Atom& val)
 {
 	if (_callback_enabled) {
-		if (_all_voices_radio->get_active()) {
-			App::instance().engine()->set_property(port->path(),
-				   App::instance().uris().ingen_value,
-				   val);
-			port->value(val);
-		} else {
-			int voice = _voice_spinbutton->get_value_as_int();
-			App::instance().engine()->set_voice_value(port->path(), voice, val);
-			port->value(val);
-		}
-	}
-}
-
-
-void
-ControlPanel::all_voices_selected()
-{
-	_voice_spinbutton->property_sensitive() = false;
-}
-
-
-void
-ControlPanel::specific_voice_selected()
-{
-	_voice_spinbutton->property_sensitive() = true;
-}
-
-
-void
-ControlPanel::parent_property_changed(const Raul::URI& predicate, const Raul::Atom& value)
-{
-	if (predicate == App::instance().uris().ingen_polyphony && value.type() == Atom::INT)
-		_voice_spinbutton->set_range(0, value.get_int32() - 1);
-}
-
-
-void
-ControlPanel::property_changed(const Raul::URI& predicate, const Raul::Atom& value)
-{
-	if (predicate == App::instance().uris().ingen_polyphony && value.type() == Atom::BOOL) {
-		if (value.get_bool())
-			_voice_control_box->show();
-		else
-			_voice_control_box->hide();
+		App::instance().engine()->set_property(port->path(),
+				App::instance().uris().ingen_value,
+				val);
+		port->value(val);
 	}
 }
 
diff --git a/src/gui/ControlPanel.hpp b/src/gui/ControlPanel.hpp
index 402ffe13..8683bb58 100644
--- a/src/gui/ControlPanel.hpp
+++ b/src/gui/ControlPanel.hpp
@@ -73,22 +73,12 @@ public:
 	}
 
 private:
-	void all_voices_selected();
-	void specific_voice_selected();
-
-	void property_changed(const Raul::URI& predicate, const Raul::Atom& value);
-	void parent_property_changed(const Raul::URI& predicate, const Raul::Atom& value);
-
 	bool _callback_enabled;
 
 	std::pair<int,int> _ideal_size;
 
 	std::vector<Control*> _controls;
 	Gtk::VBox*            _control_box;
-	Gtk::Box*             _voice_control_box;
-	Gtk::RadioButton*     _all_voices_radio;
-	Gtk::RadioButton*     _specific_voice_radio;
-	Gtk::SpinButton*      _voice_spinbutton;
 };
 
 
diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp
index 434d455c..b8cc83a1 100644
--- a/src/gui/PatchView.cpp
+++ b/src/gui/PatchView.cpp
@@ -197,7 +197,7 @@ PatchView::process_toggled()
 void
 PatchView::poly_changed()
 {
-	App::instance().engine()->set_property(_patch->meta().uri(),
+	App::instance().engine()->set_property(_patch->path(),
 			App::instance().uris().ingen_polyphony,
 			_poly_spin->get_value_as_int());
 }
diff --git a/src/gui/ingen_gui.glade b/src/gui/ingen_gui.glade
index 85058105..9178a7fe 100644
--- a/src/gui/ingen_gui.glade
+++ b/src/gui/ingen_gui.glade
@@ -1332,75 +1332,6 @@
                 <property name="position">0</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkHBox" id="control_panel_voice_controls_box">
-                <property name="visible">True</property>
-                <property name="homogeneous">True</property>
-                <child>
-                  <widget class="GtkRadioButton" id="control_panel_all_voices_radio">
-                    <property name="label" translatable="yes">All Voices</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="tooltip" translatable="yes">Apply changed controls to all voices</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkHBox" id="hbox32">
-                    <property name="visible">True</property>
-                    <property name="spacing">5</property>
-                    <child>
-                      <widget class="GtkRadioButton" id="control_panel_specific_voice_radio">
-                        <property name="label" translatable="yes">Specific Voice:</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip" translatable="yes">Apply changed controls to one voice only</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">control_panel_all_voices_radio</property>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkSpinButton" id="control_panel_voice_spinbutton">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip" translatable="yes">Voice control changes are applied to</property>
-                        <property name="adjustment">1 1 100 1 10 0</property>
-                        <property name="climb_rate">1</property>
-                        <property name="numeric">True</property>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="padding">5</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
           </widget>
         </child>
         <child>
diff --git a/src/shared/ClashAvoider.cpp b/src/shared/ClashAvoider.cpp
index c86d9cde..f3344a5f 100644
--- a/src/shared/ClashAvoider.cpp
+++ b/src/shared/ClashAvoider.cpp
@@ -194,15 +194,6 @@ ClashAvoider::set_property(const Raul::URI&  subject,
 
 
 void
-ClashAvoider::set_voice_value(const Raul::Path& port_path,
-                              uint32_t          voice,
-                              const Raul::Atom& value)
-{
-	_target.set_voice_value(map_path(port_path), voice, value);
-}
-
-
-void
 ClashAvoider::del(const Raul::Path& path)
 {
 	_target.del(map_path(path));
diff --git a/src/shared/ClashAvoider.hpp b/src/shared/ClashAvoider.hpp
index 9c131e0e..260648d5 100644
--- a/src/shared/ClashAvoider.hpp
+++ b/src/shared/ClashAvoider.hpp
@@ -68,10 +68,6 @@ public:
 	                          const Raul::URI&  predicate,
 	                          const Raul::Atom& value);
 
-	virtual void set_voice_value(const Raul::Path& port_path,
-	                             uint32_t          voice,
-	                             const Raul::Atom& value);
-
 	virtual void del(const Raul::Path& path);
 
 private: