From 1bd8646d350b6a4348e7c860b7d75ed5a386a7a0 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 26 Sep 2012 08:10:10 +0100 Subject: [PATCH] Carla: Fix incoming midi from OSC --- c++/carla-backend/carla_plugin.h | 4 ++-- src/carla_control.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/c++/carla-backend/carla_plugin.h b/c++/carla-backend/carla_plugin.h index 55fc2ca..98974d9 100644 --- a/c++/carla-backend/carla_plugin.h +++ b/c++/carla-backend/carla_plugin.h @@ -1672,7 +1672,7 @@ public: #endif if (sendCallback) - x_engine->callback(velo ? CALLBACK_NOTE_ON : CALLBACK_NOTE_OFF, m_id, note, velo, 0.0); + x_engine->callback(velo ? CALLBACK_NOTE_ON : CALLBACK_NOTE_OFF, m_id, channel, note, velo); } /*! @@ -1829,7 +1829,7 @@ public: #endif // Update Host - x_engine->callback(CALLBACK_NOTE_ON, m_id, event->value1, event->value2, event->value3); + x_engine->callback(CALLBACK_NOTE_ON, m_id, event->value1, event->value2, rint(event->value3)); break; case PluginPostEventNoteOff: diff --git a/src/carla_control.py b/src/carla_control.py index c4a0ea3..18cf626 100755 --- a/src/carla_control.py +++ b/src/carla_control.py @@ -610,7 +610,7 @@ class CarlaControlW(QMainWindow, ui_carla_control.Ui_CarlaControlW): if lo_target and self.lo_server: urlText = self.lo_address else: - urlText = "osc.udp://falkTX-Laptop:12342/Carla" #"osc.udp://127.0.0.1:19000/Carla" + urlText = "osc.tcp://127.0.0.1:19000/Carla" askValue = QInputDialog.getText(self, self.tr("Carla Control - Connect"), self.tr("Address"), text=urlText)