diff -Nru carla-git-1.9.7+git20171203/debian/changelog carla-git-1.9.7+git20171213/debian/changelog --- carla-git-1.9.7+git20171203/debian/changelog 2017-12-02 22:59:25.000000000 +0000 +++ carla-git-1.9.7+git20171213/debian/changelog 2017-12-12 23:26:53.000000000 +0000 @@ -1,3 +1,9 @@ +carla-git (2:1.9.7+git20171213) trusty; urgency=medium + + * Update + + -- falkTX Wed, 13 Dec 2017 00:26:41 +0100 + carla-git (2:1.9.7+git20171203) trusty; urgency=medium * Update diff -Nru carla-git-1.9.7+git20171203/.git/FETCH_HEAD carla-git-1.9.7+git20171213/.git/FETCH_HEAD --- carla-git-1.9.7+git20171203/.git/FETCH_HEAD 2017-12-02 22:58:33.000000000 +0000 +++ carla-git-1.9.7+git20171213/.git/FETCH_HEAD 2017-12-12 23:26:38.000000000 +0000 @@ -1 +1 @@ -ad5dc1941fe7ec6887a3af9065d9b2fbbde0a896 branch 'master' of github.com:falkTX/Carla +f2473b40f06d81b3f7b8afd8ff1c13fcb7f4b7cf branch 'master' of github.com:falkTX/Carla Binary files /tmp/tmp9aSdlA/i6jxtlo1zq/carla-git-1.9.7+git20171203/.git/index and /tmp/tmp9aSdlA/kdR12Y_mjo/carla-git-1.9.7+git20171213/.git/index differ diff -Nru carla-git-1.9.7+git20171203/.git/logs/HEAD carla-git-1.9.7+git20171213/.git/logs/HEAD --- carla-git-1.9.7+git20171203/.git/logs/HEAD 2017-12-02 22:58:35.000000000 +0000 +++ carla-git-1.9.7+git20171213/.git/logs/HEAD 2017-12-12 23:26:38.000000000 +0000 @@ -133,3 +133,4 @@ 244ccfc2acb22e9aaa2a8faf17443656db4174dc 49ca0f1fb98b9494fea09653aa3050837bbe0576 falkTX 1512148009 +0100 pull: Fast-forward 49ca0f1fb98b9494fea09653aa3050837bbe0576 0e301dc5620ca667151df016f23953681d7b866f falkTX 1512234723 +0100 pull: Fast-forward 0e301dc5620ca667151df016f23953681d7b866f ad5dc1941fe7ec6887a3af9065d9b2fbbde0a896 falkTX 1512255515 +0100 pull: Fast-forward +ad5dc1941fe7ec6887a3af9065d9b2fbbde0a896 f2473b40f06d81b3f7b8afd8ff1c13fcb7f4b7cf falkTX 1513121198 +0100 pull: Fast-forward diff -Nru carla-git-1.9.7+git20171203/.git/logs/refs/heads/master carla-git-1.9.7+git20171213/.git/logs/refs/heads/master --- carla-git-1.9.7+git20171203/.git/logs/refs/heads/master 2017-12-02 22:58:35.000000000 +0000 +++ carla-git-1.9.7+git20171213/.git/logs/refs/heads/master 2017-12-12 23:26:38.000000000 +0000 @@ -132,3 +132,4 @@ 244ccfc2acb22e9aaa2a8faf17443656db4174dc 49ca0f1fb98b9494fea09653aa3050837bbe0576 falkTX 1512148009 +0100 pull: Fast-forward 49ca0f1fb98b9494fea09653aa3050837bbe0576 0e301dc5620ca667151df016f23953681d7b866f falkTX 1512234723 +0100 pull: Fast-forward 0e301dc5620ca667151df016f23953681d7b866f ad5dc1941fe7ec6887a3af9065d9b2fbbde0a896 falkTX 1512255515 +0100 pull: Fast-forward +ad5dc1941fe7ec6887a3af9065d9b2fbbde0a896 f2473b40f06d81b3f7b8afd8ff1c13fcb7f4b7cf falkTX 1513121198 +0100 pull: Fast-forward diff -Nru carla-git-1.9.7+git20171203/.git/logs/refs/remotes/origin/master carla-git-1.9.7+git20171213/.git/logs/refs/remotes/origin/master --- carla-git-1.9.7+git20171203/.git/logs/refs/remotes/origin/master 2017-12-02 22:58:33.000000000 +0000 +++ carla-git-1.9.7+git20171213/.git/logs/refs/remotes/origin/master 2017-12-12 23:26:38.000000000 +0000 @@ -131,3 +131,4 @@ 244ccfc2acb22e9aaa2a8faf17443656db4174dc 49ca0f1fb98b9494fea09653aa3050837bbe0576 falkTX 1512148009 +0100 pull: fast-forward 49ca0f1fb98b9494fea09653aa3050837bbe0576 0e301dc5620ca667151df016f23953681d7b866f falkTX 1512234723 +0100 pull: fast-forward 0e301dc5620ca667151df016f23953681d7b866f ad5dc1941fe7ec6887a3af9065d9b2fbbde0a896 falkTX 1512255513 +0100 pull: fast-forward +ad5dc1941fe7ec6887a3af9065d9b2fbbde0a896 f2473b40f06d81b3f7b8afd8ff1c13fcb7f4b7cf falkTX 1513121198 +0100 pull: fast-forward diff -Nru carla-git-1.9.7+git20171203/.git/objects/30/e3d829e25088adcedbf930f8374a457d975aa3 carla-git-1.9.7+git20171213/.git/objects/30/e3d829e25088adcedbf930f8374a457d975aa3 --- carla-git-1.9.7+git20171203/.git/objects/30/e3d829e25088adcedbf930f8374a457d975aa3 1970-01-01 00:00:00.000000000 +0000 +++ carla-git-1.9.7+git20171213/.git/objects/30/e3d829e25088adcedbf930f8374a457d975aa3 2017-12-12 23:26:38.000000000 +0000 @@ -0,0 +1 @@ +xKj1)4HBV>Aٶ#aF&>~GQ*y ٷ9g)\艊r$^;"gq4d&KΔ $9\¡M1f{mx?n3 Hhz'Zc=ҺtR{@ɑSk+qiRtew"kO \ No newline at end of file Binary files /tmp/tmp9aSdlA/i6jxtlo1zq/carla-git-1.9.7+git20171203/.git/objects/31/5458b5512b86e63a7dec002264617dc31b17c6 and /tmp/tmp9aSdlA/kdR12Y_mjo/carla-git-1.9.7+git20171213/.git/objects/31/5458b5512b86e63a7dec002264617dc31b17c6 differ Binary files /tmp/tmp9aSdlA/i6jxtlo1zq/carla-git-1.9.7+git20171203/.git/objects/40/ee5b83462f5a1e36780b8161ef79c49ac1f3c8 and /tmp/tmp9aSdlA/kdR12Y_mjo/carla-git-1.9.7+git20171213/.git/objects/40/ee5b83462f5a1e36780b8161ef79c49ac1f3c8 differ Binary files /tmp/tmp9aSdlA/i6jxtlo1zq/carla-git-1.9.7+git20171203/.git/objects/49/eec80611a5e30d15415a4a69891b5af6a99e18 and /tmp/tmp9aSdlA/kdR12Y_mjo/carla-git-1.9.7+git20171213/.git/objects/49/eec80611a5e30d15415a4a69891b5af6a99e18 differ Binary files /tmp/tmp9aSdlA/i6jxtlo1zq/carla-git-1.9.7+git20171203/.git/objects/51/0dd2d830debd6df064a4499a91dbd491b5446c and /tmp/tmp9aSdlA/kdR12Y_mjo/carla-git-1.9.7+git20171213/.git/objects/51/0dd2d830debd6df064a4499a91dbd491b5446c differ Binary files /tmp/tmp9aSdlA/i6jxtlo1zq/carla-git-1.9.7+git20171203/.git/objects/70/476eab00f855f1c348e5935aa5a330021e749f and /tmp/tmp9aSdlA/kdR12Y_mjo/carla-git-1.9.7+git20171213/.git/objects/70/476eab00f855f1c348e5935aa5a330021e749f differ Binary files /tmp/tmp9aSdlA/i6jxtlo1zq/carla-git-1.9.7+git20171203/.git/objects/80/2666292faf021b855f89e41ce8065562c2657d and /tmp/tmp9aSdlA/kdR12Y_mjo/carla-git-1.9.7+git20171213/.git/objects/80/2666292faf021b855f89e41ce8065562c2657d differ Binary files /tmp/tmp9aSdlA/i6jxtlo1zq/carla-git-1.9.7+git20171203/.git/objects/a9/f032774da12774c04d7bf89bd545d4bbb46cb9 and /tmp/tmp9aSdlA/kdR12Y_mjo/carla-git-1.9.7+git20171213/.git/objects/a9/f032774da12774c04d7bf89bd545d4bbb46cb9 differ Binary files /tmp/tmp9aSdlA/i6jxtlo1zq/carla-git-1.9.7+git20171203/.git/objects/e8/3f5f9e5462c7b98eb892a6fe344f41715ef51e and /tmp/tmp9aSdlA/kdR12Y_mjo/carla-git-1.9.7+git20171213/.git/objects/e8/3f5f9e5462c7b98eb892a6fe344f41715ef51e differ Binary files /tmp/tmp9aSdlA/i6jxtlo1zq/carla-git-1.9.7+git20171203/.git/objects/f2/473b40f06d81b3f7b8afd8ff1c13fcb7f4b7cf and /tmp/tmp9aSdlA/kdR12Y_mjo/carla-git-1.9.7+git20171213/.git/objects/f2/473b40f06d81b3f7b8afd8ff1c13fcb7f4b7cf differ Binary files /tmp/tmp9aSdlA/i6jxtlo1zq/carla-git-1.9.7+git20171203/.git/objects/fd/1c252a34f81358e0eeba963b5ffe0897d1786e and /tmp/tmp9aSdlA/kdR12Y_mjo/carla-git-1.9.7+git20171213/.git/objects/fd/1c252a34f81358e0eeba963b5ffe0897d1786e differ diff -Nru carla-git-1.9.7+git20171203/.git/ORIG_HEAD carla-git-1.9.7+git20171213/.git/ORIG_HEAD --- carla-git-1.9.7+git20171203/.git/ORIG_HEAD 2017-12-02 22:58:33.000000000 +0000 +++ carla-git-1.9.7+git20171213/.git/ORIG_HEAD 2017-12-12 23:26:38.000000000 +0000 @@ -1 +1 @@ -0e301dc5620ca667151df016f23953681d7b866f +ad5dc1941fe7ec6887a3af9065d9b2fbbde0a896 diff -Nru carla-git-1.9.7+git20171203/.git/refs/heads/master carla-git-1.9.7+git20171213/.git/refs/heads/master --- carla-git-1.9.7+git20171203/.git/refs/heads/master 2017-12-02 22:58:35.000000000 +0000 +++ carla-git-1.9.7+git20171213/.git/refs/heads/master 2017-12-12 23:26:38.000000000 +0000 @@ -1 +1 @@ -ad5dc1941fe7ec6887a3af9065d9b2fbbde0a896 +f2473b40f06d81b3f7b8afd8ff1c13fcb7f4b7cf diff -Nru carla-git-1.9.7+git20171203/.git/refs/remotes/origin/master carla-git-1.9.7+git20171213/.git/refs/remotes/origin/master --- carla-git-1.9.7+git20171203/.git/refs/remotes/origin/master 2017-12-02 22:58:33.000000000 +0000 +++ carla-git-1.9.7+git20171213/.git/refs/remotes/origin/master 2017-12-12 23:26:38.000000000 +0000 @@ -1 +1 @@ -ad5dc1941fe7ec6887a3af9065d9b2fbbde0a896 +f2473b40f06d81b3f7b8afd8ff1c13fcb7f4b7cf diff -Nru carla-git-1.9.7+git20171203/source/carla_skin.py carla-git-1.9.7+git20171213/source/carla_skin.py --- carla-git-1.9.7+git20171203/source/carla_skin.py 2017-11-18 00:57:31.000000000 +0000 +++ carla-git-1.9.7+git20171213/source/carla_skin.py 2017-12-12 23:26:38.000000000 +0000 @@ -547,15 +547,19 @@ paramInfo = self.host.get_parameter_info(self.fPluginId, i) paramData = self.host.get_parameter_data(self.fPluginId, i) paramRanges = self.host.get_parameter_ranges(self.fPluginId, i) + isInteger = (paramData['hints'] & PARAMETER_IS_INTEGER) != 0 if paramData['type'] != PARAMETER_INPUT: continue if paramData['hints'] & PARAMETER_IS_BOOLEAN: continue - if (paramData['hints'] & PARAMETER_IS_INTEGER) != 0 and paramRanges['max']-paramRanges['min'] <= 10.0: - continue if (paramData['hints'] & PARAMETER_IS_ENABLED) == 0: continue + if (paramData['hints'] & PARAMETER_USES_SCALEPOINTS) != 0 and not isInteger: + # NOTE: we assume integer scalepoints are continuous + continue + if isInteger and paramRanges['max']-paramRanges['min'] <= 3: + continue if paramInfo['name'].startswith("unused"): continue @@ -565,6 +569,10 @@ widget.setLabel(paramName) widget.setMinimum(paramRanges['min']) widget.setMaximum(paramRanges['max']) + + if isInteger: + widget.setPrecision(paramRanges['max']-paramRanges['min'], True) + setPixmapDialStyle(widget, i, parameterCount, self.fSkinStyle) index += 1 diff -Nru carla-git-1.9.7+git20171203/source/widgets/pixmapdial.py carla-git-1.9.7+git20171213/source/widgets/pixmapdial.py --- carla-git-1.9.7+git20171203/source/widgets/pixmapdial.py 2017-11-18 00:57:31.000000000 +0000 +++ carla-git-1.9.7+git20171213/source/widgets/pixmapdial.py 2017-12-12 23:26:38.000000000 +0000 @@ -72,6 +72,8 @@ self.fMinimum = 0.0 self.fMaximum = 1.0 self.fRealValue = 0.0 + self.fPrecision = 10000 + self.fIsInteger = False self.fIsHovered = False self.fIsPressed = False @@ -120,9 +122,9 @@ self.updateSizes() - # Fake internal value, 10'000 precision + # Fake internal value, custom precision QDial.setMinimum(self, 0) - QDial.setMaximum(self, 10000) + QDial.setMaximum(self, self.fPrecision) QDial.setValue(self, 0) self.valueChanged.connect(self.slot_valueChanged) @@ -231,13 +233,18 @@ self.updateSizes() self.update() + def setPrecision(self, value, isInteger): + self.fPrecision = value + self.fIsInteger = isInteger + QDial.setMaximum(self, value) + def setMinimum(self, value): self.fMinimum = value def setMaximum(self, value): self.fMaximum = value - def setValue(self, value): + def setValue(self, value, emitSignal=False): if self.fRealValue == value: return @@ -246,11 +253,11 @@ self.fRealValue = self.fMinimum elif value >= self.fMaximum: - qtValue = 10000 + qtValue = self.fPrecision self.fRealValue = self.fMaximum else: - qtValue = int(float(value - self.fMinimum) / float(self.fMaximum - self.fMinimum) * 10000) + qtValue = round(float(value - self.fMinimum) / float(self.fMaximum - self.fMinimum) * self.fPrecision) self.fRealValue = value # Block change signal, we'll handle it ourselves @@ -258,11 +265,12 @@ QDial.setValue(self, qtValue) self.blockSignals(False) - self.realValueChanged.emit(self.fRealValue) + if emitSignal: + self.realValueChanged.emit(self.fRealValue) @pyqtSlot(int) def slot_valueChanged(self, value): - self.fRealValue = float(value)/10000.0 * (self.fMaximum - self.fMinimum) + self.fMinimum + self.fRealValue = float(value)/self.fPrecision * (self.fMaximum - self.fMinimum) + self.fMinimum self.realValueChanged.emit(self.fRealValue) @pyqtSlot() @@ -314,8 +322,16 @@ pos = event.pos() dx = range * float(pos.x() - self.fLastDragPos.x()) / self.width() dy = range * float(pos.y() - self.fLastDragPos.y()) / self.height() + value = self.fLastDragValue + dx - dy + + if value < self.fMinimum: + value = self.fMinimum + elif value > self.fMaximum: + value = self.fMaximum + elif self.fIsInteger: + value = float(round(value)) - self.setValue(self.fLastDragValue + dx - dy) + self.setValue(value, True) def mouseReleaseEvent(self, event): if self.fDialMode == self.MODE_DEFAULT: