Merge weird split set_port_value / set_port_value_immediately API (whether a command is queued or 'immediate' is a property of the engine interface, really).

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

3 files changed, 10 insertions, 11 deletions

diff --git a/src/libs/gui/ControlPanel.cpp b/src/libs/gui/ControlPanel.cpp
index 0e637721..7da07dbb 100644
--- a/src/libs/gui/ControlPanel.cpp
+++ b/src/libs/gui/ControlPanel.cpp
@@ -226,16 +226,14 @@ void
 ControlPanel::value_changed(SharedPtr<PortModel> port, float val)
 {
 	if (_callback_enabled) {
-	
 		if (_all_voices_radio->get_active()) {
-			App::instance().engine()->set_port_value_immediate(port->path(), Atom(val));
+			App::instance().engine()->set_port_value(port->path(), Atom(val));
 			port->value(val);
 		} else {
 			int voice = _voice_spinbutton->get_value_as_int() - 1;
-			App::instance().engine()->set_voice_value_immediate(port->path(), voice, Atom(val));
+			App::instance().engine()->set_voice_value(port->path(), voice, Atom(val));
 			port->value(val);
 		}
-
 	}
 }
 
diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp
index f96a9f57..4f01a7f7 100644
--- a/src/libs/gui/PatchCanvas.cpp
+++ b/src/libs/gui/PatchCanvas.cpp
@@ -445,8 +445,7 @@ PatchCanvas::connect(boost::shared_ptr<FlowCanvas::Connectable> src_port,
 		return;
 
 	// Midi binding/learn shortcut
-	if (src->model()->type().is_event() && dst->model()->type().is_control())
-	{
+	if (src->model()->type().is_event() && dst->model()->type().is_control()) {
 		cerr << "[PatchCanvas] FIXME: MIDI binding shortcut" << endl;
 #if 0
 		SharedPtr<PluginModel> pm(new PluginModel(PluginModel::Internal, "", "midi_control_in", ""));
diff --git a/src/libs/gui/Port.cpp b/src/libs/gui/Port.cpp
index ab574f88..fd35ff90 100644
--- a/src/libs/gui/Port.cpp
+++ b/src/libs/gui/Port.cpp
@@ -122,11 +122,13 @@ Port::activity()
 void
 Port::set_control(float value, bool signal)
 {
-	if (_port_model->type() != DataType::CONTROL && _port_model->type() != DataType::AUDIO)
-		return;
-
-	if (signal)
-		App::instance().engine()->set_port_value_immediate(_port_model->path(), Atom(value));
+	if (signal) {
+		if (_port_model->type() == DataType::CONTROL) {
+			App::instance().engine()->set_port_value(_port_model->path(), Atom(value));
+		} else if (_port_model->type() == DataType::EVENT) {
+			cout << "EVENT CONTROL" << endl;
+		}
+	}
 
 	FlowCanvas::Port::set_control(value);
 }