From 964a9ee77e6a19ce02f1d0cf57d248bad51d9391 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 3 Oct 2012 10:58:24 +0100 Subject: [PATCH] Misc fixes --- .../carla_backend_standalone.cpp | 4 +- c++/xycontroller/xycontroller.cpp | 4 +- src/paramspinbox.py | 59 ++++++++++--------- src/shared.py | 4 +- 4 files changed, 37 insertions(+), 34 deletions(-) diff --git a/c++/carla-backend/carla_backend_standalone.cpp b/c++/carla-backend/carla_backend_standalone.cpp index 0901253..7e21ec9 100644 --- a/c++/carla-backend/carla_backend_standalone.cpp +++ b/c++/carla-backend/carla_backend_standalone.cpp @@ -1538,7 +1538,9 @@ public: if (m_serverThread) { lo_server_thread_stop(m_serverThread); - lo_server_thread_del_method(m_serverThread, nullptr, nullptr); + lo_server_thread_del_method(m_serverThread, "/reply", "ssss"); + lo_server_thread_del_method(m_serverThread, "/nsm/client/open", "sss"); + lo_server_thread_del_method(m_serverThread, "/nsm/client/save", ""); lo_server_thread_free(m_serverThread); } } diff --git a/c++/xycontroller/xycontroller.cpp b/c++/xycontroller/xycontroller.cpp index b101d3f..441e09a 100644 --- a/c++/xycontroller/xycontroller.cpp +++ b/c++/xycontroller/xycontroller.cpp @@ -136,8 +136,8 @@ void MIDI_CC_LIST__init() MIDI_CC_LIST << "0x4F Control 10 [Undefined]"; MIDI_CC_LIST << "0x50 General Purpose 5"; MIDI_CC_LIST << "0x51 General Purpose 6"; - MIDI_CC_LIST << "0x52 General Purpose 8"; - MIDI_CC_LIST << "0x53 General Purpose 9"; + MIDI_CC_LIST << "0x52 General Purpose 7"; + MIDI_CC_LIST << "0x53 General Purpose 8"; MIDI_CC_LIST << "0x54 Portamento Control"; MIDI_CC_LIST << "0x5B FX 1 Depth [Reverb]"; MIDI_CC_LIST << "0x5C FX 2 Depth [Tremolo]"; diff --git a/src/paramspinbox.py b/src/paramspinbox.py index dc5877c..079b6f1 100644 --- a/src/paramspinbox.py +++ b/src/paramspinbox.py @@ -64,15 +64,15 @@ class ParamProgressBar(QProgressBar): def __init__(self, parent): QProgressBar.__init__(self, parent) - self._minimum = 0.0 - self._maximum = 1.0 - self._step_small = 0.0 - self._rvalue = 0.0 + self.m_leftClickDown = False - self._label = "" - self._pre_label = " " - self._left_click_down = False - self._textCall = None + self.m_minimum = 0.0 + self.m_maximum = 1.0 + self.m_rvalue = 0.0 + + self.m_label = "" + self.m_preLabel = " " + self.m_textCall = None self.setMinimum(0) self.setMaximum(1000) @@ -80,61 +80,62 @@ class ParamProgressBar(QProgressBar): self.setFormat("(none)") def set_minimum(self, value): - self._minimum = value + self.m_minimum = value def set_maximum(self, value): - self._maximum = value + self.m_maximum = value def set_value(self, value): - self._rvalue = value - vper = (value - self._minimum) / (self._maximum - self._minimum) + self.m_rvalue = value + vper = (value - self.m_minimum) / (self.m_maximum - self.m_minimum) self.setValue(vper * 1000) def set_label(self, label): - self._label = label.strip() + self.m_label = label.strip() - if self._label == "(coef)": - self._label = "" - self._pre_label = "*" + if self.m_label == "(coef)": + self.m_label = "" + self.m_preLabel = "*" self.update() def set_text_call(self, textCall): - self._textCall = textCall + self.m_textCall = textCall def handleMouseEventPos(self, pos): xper = float(pos.x()) / self.width() - value = xper * (self._maximum - self._minimum) + self._minimum + value = xper * (self.m_maximum - self.m_minimum) + self.m_minimum - if value < self._minimum: - value = self._minimum - elif value > self._maximum: - value = self._maximum + if value < self.m_minimum: + value = self.m_minimum + elif value > self.m_maximum: + value = self.m_maximum self.emit(SIGNAL("valueChangedFromBar(double)"), value) def mousePressEvent(self, event): if event.button() == Qt.LeftButton: self.handleMouseEventPos(event.pos()) - self._left_click_down = True + self.m_leftClickDown = True else: - self._left_click_down = False + self.m_leftClickDown = False QProgressBar.mousePressEvent(self, event) def mouseMoveEvent(self, event): - if self._left_click_down: + if self.m_leftClickDown: self.handleMouseEventPos(event.pos()) QProgressBar.mouseMoveEvent(self, event) def mouseReleaseEvent(self, event): - self._left_click_down = False + self.m_leftClickDown = False QProgressBar.mouseReleaseEvent(self, event) def paintEvent(self, event): - if self._textCall: - self.setFormat("%s %s %s" % (self._pre_label, self._textCall(), self._label)) + if self.m_textCall: + self.setFormat("%s %s %s" % (self.m_preLabel, self.m_textCall(), self.m_label)) else: - self.setFormat("%s %f %s" % (self._pre_label, self._rvalue, self._label)) + self.setFormat("%s %f %s" % (self.m_preLabel, self.m_rvalue, self.m_label)) + QProgressBar.paintEvent(self, event) # Special SpinBox used for parameters diff --git a/src/shared.py b/src/shared.py index e855345..15d8464 100644 --- a/src/shared.py +++ b/src/shared.py @@ -183,8 +183,8 @@ MIDI_CC_LIST = ( "0x4F Control 10 [Undefined]", "0x50 General Purpose 5", "0x51 General Purpose 6", - "0x52 General Purpose 8", - "0x53 General Purpose 9", + "0x52 General Purpose 7", + "0x53 General Purpose 8", "0x54 Portamento Control", "0x5B FX 1 Depth [Reverb]", "0x5C FX 2 Depth [Tremolo]",