From 397b786a32fc08142b15c8bd4fef728a21211430 Mon Sep 17 00:00:00 2001 From: Michael Schmidt Date: Tue, 7 Jan 2020 01:00:59 +0100 Subject: [PATCH 1/3] Traktor Kontrol S2MK3: Fix jog wheel pitch bend --- .../Traktor-Kontrol-S2-MK3-hid-scripts.js | 34 +++++++------------ 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js b/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js index 74789054c6ad..f3a954cd1d03 100644 --- a/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js +++ b/res/controllers/Traktor-Kontrol-S2-MK3-hid-scripts.js @@ -35,6 +35,7 @@ var TraktorS2MK3 = new function () { this.syncPressedTimer = { "[Channel1]": 0, "[Channel2]": 0 }; // Timer to distinguish between short and long press // Jog wheels + this.pitchBendMultiplier = 1.1; this.lastTickVal = [0, 0]; this.lastTickTime = [0.0, 0.0]; @@ -531,22 +532,19 @@ TraktorS2MK3.jogTouchHandler = function (field) { TraktorS2MK3.jogHandler = function (field) { var deckNumber = TraktorS2MK3.controller.resolveDeck(field.group); + var deltas = TraktorS2MK3.wheelDeltas(deckNumber, field.value); + var tickDelta = deltas[0]; + var timeDelta = deltas[1]; - // Jog wheel control is based on the S4MK2 mapping, might need some more review if (engine.isScratching(deckNumber)) { - var deltas = TraktorS2MK3.wheelDeltas(field.group, field.value); - var tickDelta = deltas[0]; - var timeDelta = deltas[1]; - - var velocity = (tickDelta / timeDelta) / 3; + engine.scratchTick(deckNumber, tickDelta); + } else { + var velocity = (tickDelta / timeDelta) * TraktorS2MK3.pitchBendMultiplier; engine.setValue(field.group, "jog", velocity); - if (engine.getValue(field.group, "scratch2_enable")) { - engine.scratchTick(deckNumber, tickDelta); - } } }; -TraktorS2MK3.wheelDeltas = function (group, value) { +TraktorS2MK3.wheelDeltas = function (deckNumber, value) { // When the wheel is touched, four bytes change, but only the first behaves predictably. // It looks like the wheel is 1024 ticks per revolution. var tickval = value & 0xFF; @@ -554,17 +552,11 @@ TraktorS2MK3.wheelDeltas = function (group, value) { var prevTick = 0; var prevTime = 0; - if (group[8] === "1" || group[8] === "3") { - prevTick = this.lastTickVal[0]; - prevTime = this.lastTickTime[0]; - this.lastTickVal[0] = tickval; - this.lastTickTime[0] = timeval; - } else { - prevTick = this.lastTickVal[1]; - prevTime = this.lastTickTime[1]; - this.lastTickVal[1] = tickval; - this.lastTickTime[1] = timeval; - } + // Group 1 and 2 -> Array index 0 and 1 + prevTick = this.lastTickVal[deckNumber - 1]; + prevTime = this.lastTickTime[deckNumber - 1]; + this.lastTickVal[deckNumber - 1] = tickval; + this.lastTickTime[deckNumber - 1] = timeval; if (prevTime > timeval) { // We looped around. Adjust current time so that subtraction works. From 13acfaa37ddb314eed0091ccf35ae201e56aa013 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Thu, 9 Jan 2020 14:39:59 +0100 Subject: [PATCH 2/3] mixxx: Replace deprecated QPalette::Background with QPalette::Window --- src/mixxx.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mixxx.cpp b/src/mixxx.cpp index eff114b8553b..09a10ad92539 100644 --- a/src/mixxx.cpp +++ b/src/mixxx.cpp @@ -773,12 +773,12 @@ void MixxxMainWindow::initializeWindow() { QPalette Pal(palette()); // safe default QMenuBar background - QColor MenuBarBackground(m_pMenuBar->palette().color(QPalette::Background)); - Pal.setColor(QPalette::Background, QColor(0x202020)); + QColor MenuBarBackground(m_pMenuBar->palette().color(QPalette::Window)); + Pal.setColor(QPalette::Window, QColor(0x202020)); setAutoFillBackground(true); setPalette(Pal); // restore default QMenuBar background - Pal.setColor(QPalette::Background, MenuBarBackground); + Pal.setColor(QPalette::Window, MenuBarBackground); m_pMenuBar->setPalette(Pal); // Restore the current window state (position, maximized, etc) From e5194394163c7ff8820f1908aab5da0994dbf242 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Thu, 9 Jan 2020 14:41:27 +0100 Subject: [PATCH 3/3] Remove obsolete QPainter::HighQualityAntiAliasing renderer hint --- src/waveform/renderers/waveformrendererfilteredsignal.cpp | 1 - src/waveform/renderers/waveformrendererhsv.cpp | 1 - src/waveform/renderers/waveformrendererrgb.cpp | 1 - src/widget/wspinny.cpp | 1 - 4 files changed, 4 deletions(-) diff --git a/src/waveform/renderers/waveformrendererfilteredsignal.cpp b/src/waveform/renderers/waveformrendererfilteredsignal.cpp index 25ddb8984696..f1c654c54ce8 100644 --- a/src/waveform/renderers/waveformrendererfilteredsignal.cpp +++ b/src/waveform/renderers/waveformrendererfilteredsignal.cpp @@ -51,7 +51,6 @@ void WaveformRendererFilteredSignal::draw(QPainter* painter, painter->save(); painter->setRenderHints(QPainter::Antialiasing, false); - painter->setRenderHints(QPainter::HighQualityAntialiasing, false); painter->setRenderHints(QPainter::SmoothPixmapTransform, false); painter->setWorldMatrixEnabled(false); painter->resetTransform(); diff --git a/src/waveform/renderers/waveformrendererhsv.cpp b/src/waveform/renderers/waveformrendererhsv.cpp index 350010b473fa..95a6c29b2cef 100644 --- a/src/waveform/renderers/waveformrendererhsv.cpp +++ b/src/waveform/renderers/waveformrendererhsv.cpp @@ -45,7 +45,6 @@ void WaveformRendererHSV::draw(QPainter* painter, painter->save(); painter->setRenderHints(QPainter::Antialiasing, false); - painter->setRenderHints(QPainter::HighQualityAntialiasing, false); painter->setRenderHints(QPainter::SmoothPixmapTransform, false); painter->setWorldMatrixEnabled(false); painter->resetTransform(); diff --git a/src/waveform/renderers/waveformrendererrgb.cpp b/src/waveform/renderers/waveformrendererrgb.cpp index a87a614b9295..35acda39e92c 100644 --- a/src/waveform/renderers/waveformrendererrgb.cpp +++ b/src/waveform/renderers/waveformrendererrgb.cpp @@ -44,7 +44,6 @@ void WaveformRendererRGB::draw(QPainter* painter, painter->save(); painter->setRenderHints(QPainter::Antialiasing, false); - painter->setRenderHints(QPainter::HighQualityAntialiasing, false); painter->setRenderHints(QPainter::SmoothPixmapTransform, false); painter->setWorldMatrixEnabled(false); painter->resetTransform(); diff --git a/src/widget/wspinny.cpp b/src/widget/wspinny.cpp index c9d23f38495b..371fc8c451ce 100644 --- a/src/widget/wspinny.cpp +++ b/src/widget/wspinny.cpp @@ -323,7 +323,6 @@ void WSpinny::render() { QPainter p(this); p.setRenderHint(QPainter::Antialiasing); - p.setRenderHint(QPainter::HighQualityAntialiasing); p.setRenderHint(QPainter::SmoothPixmapTransform); if (m_pBgImage) {