Merge remote-tracking branch 'upstream/2.2' into support_joymidi

mixxxdj · Jan 15, 2020 · 0ee30eb · 0ee30eb
2 parents 6cbf50f + 9d09d5b
commit 0ee30eb
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 28 deletions.
diff --git 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,40 +532,31 @@ 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;
     var timeval = value >>> 16;
     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.

diff --git a/src/mixxx.cpp b/src/mixxx.cpp
@@ -822,12 +822,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)

diff --git a/src/waveform/renderers/waveformrendererfilteredsignal.cpp b/src/waveform/renderers/waveformrendererfilteredsignal.cpp
@@ -53,7 +53,6 @@ void WaveformRendererFilteredSignal::draw(QPainter* painter,
     PainterScope PainterScope(painter);
 
     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
@@ -47,7 +47,6 @@ void WaveformRendererHSV::draw(QPainter* painter,
     PainterScope PainterScope(painter);
 
     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
@@ -46,7 +46,6 @@ void WaveformRendererRGB::draw(QPainter* painter,
     PainterScope PainterScope(painter);
 
     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
@@ -325,7 +325,6 @@ void WSpinny::render(VSyncThread* vSyncThread) {
 
     QPainter p(this);
     p.setRenderHint(QPainter::Antialiasing);
-    p.setRenderHint(QPainter::HighQualityAntialiasing);
     p.setRenderHint(QPainter::SmoothPixmapTransform);
 
     if (m_pBgImage) {