Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine

CMakeLists.txt

@@ -356,6 +356,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/baseplaylistfeature.cpp
   src/library/basesqltablemodel.cpp
   src/library/basetrackcache.cpp
+  src/library/basetracksetfeature.cpp
   src/library/basetracktablemodel.cpp
   src/library/bpmdelegate.cpp
   src/library/browse/browsefeature.cpp
@@ -1248,8 +1249,11 @@ option(STATIC_DEPS "Link dependencies statically" OFF)
 # Chromaprint
 find_package(Chromaprint REQUIRED)
 target_link_libraries(mixxx-lib PUBLIC Chromaprint::Chromaprint)
-if(WIN32 AND STATIC_DEPS)
-  target_compile_definitions(mixxx-lib PUBLIC CHROMAPRINT_NODLL)
+if(WIN32)
+  if(STATIC_DEPS)
+    target_compile_definitions(mixxx-lib PUBLIC CHROMAPRINT_NODLL)
+  endif()
+   # Rubberband is always built statically and needs fftw.
   find_package(FFTW REQUIRED)
   target_link_libraries(mixxx-lib PUBLIC FFTW::FFTW)
 endif()
@@ -1511,6 +1515,12 @@ elseif(WIN32)
     target_link_libraries(mixxx-lib PUBLIC "${QTLIBPNG_LIBRARY}")
     find_library(QTPCRE2_LIBRARY qtpcre2)
     target_link_libraries(mixxx-lib PUBLIC "${QTPCRE2_LIBRARY}")
+  else()
+    #libshout is always built statically
+    target_link_libraries(mixxx-lib PUBLIC
+      ws2_32      # libshout
+      gdi32       # libshout
+    )
   endif()
 endif()
 
@@ -1594,7 +1604,8 @@ if(SndFile_SUPPORTS_SET_COMPRESSION_LEVEL)
   target_compile_definitions(mixxx-lib PUBLIC SFC_SUPPORTS_SET_COMPRESSION_LEVEL)
 endif()
 
-if(WIN32 AND STATIC_DEPS)
+#libsndfile is always build statically, so we don't check for STATIC_DEPS
+if(WIN32)
   find_package(G72X REQUIRED)
   target_link_libraries(mixxx-lib PUBLIC G72X::G72X)
 endif()
@@ -1891,7 +1902,8 @@ if(OPUS)
   target_compile_definitions(mixxx-lib PUBLIC __OPUS__)
   target_include_directories(mixxx-lib SYSTEM PUBLIC ${Opus_INCLUDE_DIRS})
   target_link_libraries(mixxx-lib PUBLIC ${Opus_LIBRARIES})
-  if(WIN32 AND STATIC_DEPS)
+  # Opus is always built statically so we don't check STATIC_DEPS
+  if(WIN32)
     find_package(Celt)
     if(NOT Celt_FOUND)
       message(FATAL_ERROR "Opus support with static dependencies requires the celt library.")
@@ -2126,6 +2138,8 @@ if(NOT OPTIMIZE STREQUAL "off")
       # Jenkins logs) Should we turn on PGO ?
       # http://msdn.microsoft.com/en-us/library/xbf3tbeh.aspx
       target_link_options(mixxx-lib PUBLIC "/LTCG:OFF")
+    elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
+      target_compile_options(mixxx-lib PUBLIC "/GL-")
     else()
       target_compile_options(mixxx-lib PUBLIC "/GL")
       target_link_options(mixxx-lib PUBLIC "/LTCG:NOSTATUS")

appveyor.yml

@@ -150,20 +150,19 @@ for:
   environment:
     ENVIRONMENTS_URL: https://downloads.mixxx.org/builds/buildserver/2.3.x-windows/
     ENVIRONMENTS_PATH: C:\mixxx-buildserver
-    ENVIRONMENT_NAME: 2.3-j00013-PLATFORM-CONFIGURATION-static-36f44bd2-minimal
-    QT_VERSION: 5.12.0
     MSVC_PATH: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community"
     PATH: 'C:\Python37-x64;C:\Python37-x64\Scripts;%PATH%'
 
 
   install:
-    - set ENVIRONMENT_NAME=%%ENVIRONMENT_NAME:PLATFORM=%platform%%%
-    - set ENVIRONMENT_NAME=%%ENVIRONMENT_NAME:CONFIGURATION=%configuration%%%
+    - set /P ENVIRONMENT_NAME=<build/windows/golden_environment
+    - call set ENVIRONMENT_NAME=%%ENVIRONMENT_NAME:PLATFORM=%platform%%%
+    - call set ENVIRONMENT_NAME=%%ENVIRONMENT_NAME:CONFIGURATION=%configuration%%%
     - set WINLIB_PATH=%ENVIRONMENTS_PATH%\%ENVIRONMENT_NAME%
     - IF EXIST %WINLIB_PATH% (
         echo Using cached environment %WINLIB_PATH%...
       ) else (
-        mkdir %ENVIRONMENTS_PATH% &&
+        mkdir %ENVIRONMENTS_PATH% &
         echo Downloading environment %ENVIRONMENT_NAME%... &&
         curl -fsS -L -o%ENVIRONMENTS_PATH%\%ENVIRONMENT_NAME%.zip %ENVIRONMENTS_URL%/%ENVIRONMENT_NAME%.zip &&
         echo Unpacking environment %ENVIRONMENT_NAME% to %ENVIRONMENTS_PATH%... &&
@@ -173,8 +172,12 @@ for:
     - python -m pip install git+https://github.com/frerich/clcache.git
 
   before_build:
+    - FOR /D %%G IN (%WINLIB_PATH%\Qt-*) DO SET QT_PATH=%%G
+    - IF "%QT_PATH%" EQU "" (
+        echo QT not found on %WINLIB_PATH%
+      )
+    # Remove C:\Program Files\Git\usr\bin from the PATH
     - set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
-    - set QT_PATH=%WINLIB_PATH%\Qt-%QT_VERSION%
     - set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_CORES%
     - call "%MSVC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64
     - cd %APPVEYOR_BUILD_FOLDER%

build/appveyor/build_mixxx.bat

@@ -86,17 +86,21 @@ if "%4" == "skipinstaller" (
     if "%5" == "skipinstaller" (
        set PARAM_INSTALLER=
     ) else (
-       set PARAM_INSTALLER=makerelease 
+       set PARAM_INSTALLER=makerelease
     )
 )
 set WINLIB_DIR=%3
 
 SET BIN_DIR=%WINLIB_DIR%\bin
 SET LIB_DIR=%WINLIB_DIR%\lib
 SET INCLUDE_DIR=%WINLIB_DIR%\include
-REM TODO(rryan): Remove hard-coding of Qt version.
-set QT_VERSION=5.12.0
-SET QTDIR=%WINLIB_DIR%\Qt-%QT_VERSION%
+FOR /D %%G IN (%WINLIB_DIR%\Qt-*) DO SET QTDIR=%%G
+IF "!QTDIR!" EQU "" (
+echo QT not found on %WINLIB_DIR%
+exit /b 1
+)
+
+
 
 if NOT EXIST "%BIN_DIR%\scons.py" (
 echo.
@@ -179,6 +183,6 @@ FOR /F %%G IN ('dir "%BUILDTOOLS_PATH%\Tools\MSVC\%PARAM_VCVARSVER%*" /b /ad-h /
   set "LOCAL_64_CL=%BUILDTOOLS_PATH%\Tools\MSVC\%%G\bin\Hostx64\x64\cl.exe"
   if EXIST "!LOCAL_64_CL!" (
     EXIT /B 0
-  ) 
+  )
 )
 EXIT /B 1

build/depends.py

@@ -1055,6 +1055,7 @@ def sources(self, build):
                    "src/library/autodj/autodjprocessor.cpp",
                    "src/library/dao/directorydao.cpp",
                    "src/library/mixxxlibraryfeature.cpp",
+                   "src/library/basetracksetfeature.cpp",
                    "src/library/baseplaylistfeature.cpp",
                    "src/library/playlistfeature.cpp",
                    "src/library/setlogfeature.cpp",

res/controllers/Roland_DJ-505-scripts.js

@@ -1017,22 +1017,22 @@ DJ505.PadColor = {
 };
 
 DJ505.PadColorMap = new ColorMapper({
-    "#CC0000": DJ505.PadColor.RED,
-    "#CC4400": DJ505.PadColor.CORAL,
-    "#CC8800": DJ505.PadColor.ORANGE,
-    "#CCCC00": DJ505.PadColor.YELLOW,
-    "#88CC00": DJ505.PadColor.GREEN,
-    "#00CC00": DJ505.PadColor.APPLEGREEN,
-    "#00CC88": DJ505.PadColor.AQUAMARINE,
-    "#00CCCC": DJ505.PadColor.TURQUOISE,
-    "#0088CC": DJ505.PadColor.CELESTE,
-    "#0000CC": DJ505.PadColor.BLUE,
-    "#4400CC": DJ505.PadColor.AZURE,
-    "#8800CC": DJ505.PadColor.PURPLE,
-    "#CC00CC": DJ505.PadColor.MAGENTA,
-    "#CC0044": DJ505.PadColor.RED,
-    "#FFCCCC": DJ505.PadColor.APRICOT,
-    "#FFFFFF": DJ505.PadColor.WHITE,
+    0xCC0000: DJ505.PadColor.RED,
+    0xCC4400: DJ505.PadColor.CORAL,
+    0xCC8800: DJ505.PadColor.ORANGE,
+    0xCCCC00: DJ505.PadColor.YELLOW,
+    0x88CC00: DJ505.PadColor.GREEN,
+    0x00CC00: DJ505.PadColor.APPLEGREEN,
+    0x00CC88: DJ505.PadColor.AQUAMARINE,
+    0x00CCCC: DJ505.PadColor.TURQUOISE,
+    0x0088CC: DJ505.PadColor.CELESTE,
+    0x0000CC: DJ505.PadColor.BLUE,
+    0x4400CC: DJ505.PadColor.AZURE,
+    0x8800CC: DJ505.PadColor.PURPLE,
+    0xCC00CC: DJ505.PadColor.MAGENTA,
+    0xCC0044: DJ505.PadColor.RED,
+    0xFFCCCC: DJ505.PadColor.APRICOT,
+    0xFFFFFF: DJ505.PadColor.WHITE,
 });
 
 DJ505.PadSection = function(deck, offset) {

src/dialog/dlgabout.cpp

@@ -57,32 +57,16 @@ DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() {
     // New Contributors are added at the end.
     QStringList recentContributors;
     recentContributors
-            << "Stefan N&uuml;rnberger"
             << "Tuukka Pasanen"
             << "Nino MP"
             << "Nico Schl&ouml;mer"
             << "Ferran Pujol Camins"
-            << "Markus Kl&ouml;sges"
-            << "Pavel Potocek"
             << "Joan Marc&egrave; i Igual"
-            << "Timothy Rae"
-            << "Leigh Scott"
-            << "William Lemus"
             << "Josep Maria Antol&iacute;n Segura"
-            << "Nimit Bhardwaj"
-            << "Pavel Sokolov"
-            << "Devananda van der Veen"
-            << "Tatsuyuki Ishi"
-            << "Kilian Feess"
-            << "Conner Phillips"
             << "Daniel Poelzleithner"
-            << "Artyom Lyan"
-            << "Johan Lasperas"
-            << "Olaf Hering"
+            << "St&eacute;phane Lepin"
             << "Stefan Weber"
-            << "Eduardo Acero"
             << "Kshitij Gupta"
-            << "Thomas Jarosch"
             << "Matthew Nicholson"
             << "Jamie Gifford"
             << "luzpaz"
@@ -95,14 +79,21 @@ DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() {
             << "Nik Martin"
             << "Kerrick Staley"
             << "Raphael Graf"
+            << "Nik Martin"
             << "YunQiang Su"
             << "Sebastian Hasler"
             << "Philip Gottschling"
+            << "Melissa"
+            << "Ned Haughton"
+            << "Adam Szmigin"
             << "Cristiano Lacerda"
+            << "Sergey Ukolov"
             << "Ketan Lambat"
             << "Evan Dekker"
             << "Edward Kigwana"
-            << "Simon Harst";
+            << "Simon Harst"
+            << "Harshit Maurya"
+            << "Janek Fischer";
 
     QStringList specialThanks;
     specialThanks
@@ -295,8 +286,24 @@ DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() {
             << "Jan Ypma"
             << "Andreas M&uuml;ller"
             << "Sam Cross"
-            << "Joey Pabalinas";
-
+            << "Joey Pabalinas"
+            << "Stefan N&uuml;rnberger"
+            << "Markus Kl&ouml;sges"
+            << "Pavel Potocek"
+            << "Timothy Rae"
+            << "Leigh Scott"
+            << "William Lemus"
+            << "Nimit Bhardwaj"
+            << "Pavel Sokolov"
+            << "Devananda van der Veen"
+            << "Tatsuyuki Ishi"
+            << "Kilian Feess"
+            << "Conner Phillips"
+            << "Artyom Lyan"
+            << "Johan Lasperas"
+            << "Olaf Hering"
+            << "Eduardo Acero"
+            << "Thomas Jarosch";
 
     QString sectionTemplate = QString(
         "<p align=\"center\"><b>%1</b></p><p align=\"center\">%2</p>");

src/library/analysislibrarytablemodel.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "librarytablemodel.h"
+#include "library/librarytablemodel.h"
 
 class AnalysisLibraryTableModel : public LibraryTableModel
 {

src/library/autodj/autodjprocessor.cpp

@@ -278,9 +278,12 @@ void AutoDJProcessor::fadeNow() {
         double introStart = getIntroStartSecond(pToDeck);
         double timeUntilOutroEnd = outroEnd - fromDeckCurrentSecond;
 
+        // IntroStart ends up being equal to introEnd when pToDeck is
+        // paused and its introEnd marker is not set. getIntroEndSecond returns
+        // introStart thus the two end up having equal values
         if (toDeckCurrentSecond >= introStart &&
                 toDeckCurrentSecond <= introEnd &&
-                introEnd >= 0) {
+                introStart != introEnd) {
             double timeUntilIntroEnd = introEnd - toDeckCurrentSecond;
             // The fade must end by the outro end at the latest.
             fadeTime = math_min(timeUntilIntroEnd, timeUntilOutroEnd);