Merge remote-tracking branch 'upstream/main' into Q_SCALE_FACTOR

.eslintrc.json

@@ -1,9 +1,12 @@
 {
   "extends": "eslint:recommended",
   "parserOptions": {
-    "ecmaVersion": 5,
+    "ecmaVersion": 7,
     "sourceType": "script"
   },
+  "env": {
+    "es6": true
+  },
   "rules": {
     "array-bracket-spacing" : "warn",
     "block-spacing": "warn",

.github/FUNDING.yml

@@ -1 +1 @@
-custom: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QSFMYWN2B3JD2&source=url"
+custom: "https://mixxx.org/donate"

.github/workflows/build-checks.yml

@@ -49,6 +49,7 @@ jobs:
           portaudio19-dev \
           protobuf-compiler \
           qt5-default \
+          qtdeclarative5-dev \
           qtscript5-dev \
           qt5keychain-dev \
           clazy \

.github/workflows/build.yml

@@ -10,29 +10,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Ubuntu 18.04 (gcc)
-            os: ubuntu-18.04
-            cmake_args: >-
-              -DWARNINGS_FATAL=ON
-              -DBULK=ON
-              -DFAAD=ON
-              -DFFMPEG=OFF
-              -DLOCALECOMPARE=ON
-              -DMAD=ON
-              -DMODPLUG=ON
-              -DWAVPACK=ON
-              -DINSTALL_USER_UDEV_RULES=OFF
-            cmake_generator: Unix Makefiles
-            ctest_args:
-            compiler_cache: ccache
-            compiler_cache_path: ~/.ccache
-            cpack_generator: DEB
-            buildenv_basepath: /home/runner/buildenv
-            buildenv_script: tools/debian_buildenv.sh
-            artifacts_name: Ubuntu 18.04 DEB
-            artifacts_path: build/*.deb
-            artifacts_slug: ubuntu-bionic
-            qt_qpa_platform: offscreen
           - name: Ubuntu 20.04 (gcc)
             os: ubuntu-20.04
             cmake_args: >-
@@ -268,7 +245,7 @@ jobs:
         -G "${{ matrix.cmake_generator }}"
         -DCMAKE_BUILD_TYPE=RelWithDebInfo
         -DCMAKE_PREFIX_PATH="${{ env.CMAKE_PREFIX_PATH }}"
-        -DDEBUG_ASSERTIONS_FATAL=OFF
+        -DDEBUG_ASSERTIONS_FATAL=ON
         -DQt5_DIR=${{ env.QT_PATH }} ${{ matrix.cmake_args }} ${{ env.CMAKE_ARGS_EXTRA }}
         -DBATTERY=ON
         -DBROADCAST=ON
@@ -341,8 +318,8 @@ jobs:
       # No need to do the PPA build for both Ubuntu versions
       if: matrix.os == 'ubuntu-20.04'
       run: |
-        if [[ "${{ github.ref }}" == "refs/heads/2.3" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
-          CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/mixxxbetas"
+        if [[ "${{ github.ref }}" == "refs/heads/main" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
+          CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/nightlies -D CPACK_DEBIAN_DEBIAN_VERSION=0ubuntu2"
         elif [[ "${{ github.ref }}" =~ ^refs/tags/[0-9]+\.[0-9]+\.[0-9]+$ ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
           CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/mixxx"
         else

.github/workflows/pre-commit.yml

@@ -8,18 +8,15 @@ jobs:
   pre-commit:
     name: Detecting code style issues
     runs-on: ubuntu-latest
+    # The Dockerfile for this container can be found at:
+    # https://github.com/Holzhaus/mixxx-ci-docker
+    container: holzhaus/mixxx-ci:20210526
     steps:
     - name: "Check out repository"
       uses: actions/checkout@v2
       with:
         fetch-depth: 2
 
-    - name: "Set up Python"
-      uses: actions/setup-python@v2
-
-    - name: Install clang-format
-      run: sudo apt-get update && sudo apt-get install -y --no-install-recommends clang-format-10
-
     - name: "Detect code style issues (push)"
       uses: pre-commit/action@v2.0.0
       if: github.event_name == 'push'

.gitignore

@@ -1,77 +1,33 @@
 # Don't add any custom patterns for platform-specific files like .DS_Store
 # or generated by custom development tools like .vscode or .idea that don't
-# affect other developers. Instead add those custom patterns to your global
-# .gitignore file.
+# affect other developers. Instead ignore those patterns through your global
+# gitignore or locally in .git/info/exclude.
 
-*.diff
+# Logs
 *.log
-*.o
-*.orig
-*.os
-*.patch
-!build/appveyor/NSIS.patch
-*.pyc
-*.rej
-*_build
-*~
-.#*
-
-src/mixxx.rc.include
-src/mixxx.res
-
-*.sqlite
+*.log.*
 
-*.cfg
-!/res/keyboard/*.cfg
+# TOOLS
 
+# Might be created when running a Python script from the tools folder
 __pycache__
 
-lib/*/*.a
-lib/*/lib/*.a
-
-mixxx
-mixxx-test
-
-src/test/test_data
-src/test/golden_buffers/*.actual
-
-res/qrc_mixxx.cc
-
-*.wixobj
-*.wixpdb
-*.msi
-*.mst
-*.cab
-build/wix/subdirs/*.wxs
-# The following 2 files are autogenerated by scons at release time
-# based on .tmpl template file for the second one.
-build/wix/bundle/bundleloc.wxs
-build/wix/ProductID.wxi
-
-*.obj
-*.pdb
-lib/*/*.lib
-lib/*/lib/*.lib
-
-lib/qtscript-bytearray/*.cc
-
+# Clang/cmake
+*_build
 compile_commands.json
 
-# Exclude documentation generated by Doxygen
-/doxygen/
+# Doxygen documentation
+/doxygen
 
 # Exclude buildenv directory from our helper scripts
-/buildenv/
+/buildenv
 
 # CMake build configurations, generated by tools/windows_buildenv.bat
-CMakeSettings.json
+/CMakeSettings.json
 
 # Build and distribution directories for various build configurations
-/build/
-/install/
-
-# VisualStudio project files
-/.vs/
+/build
+/install
 
 # Exclude unneeded files from GoogleTest library when updating our bundled
 # GoogleTest library in the lib/ directory
@@ -89,3 +45,11 @@ lib/hidapi/dist
 lib/hidapi/doxygen
 lib/hidapi/hidtest
 lib/hidapi/testgui
+
+# Legacy compilation artifacts that are obsolete starting with 2.3
+# TODO: Delete after 2.2 with SCons has been abandoned. Developers
+# are supposed to clean their project directory!
+src/mixxx.rc.include
+src/mixxx.res
+src/test/**/*.actual
+res/qrc_mixxx.cc

.pre-commit-config.yaml

@@ -124,3 +124,18 @@ repos:
     stages:
     - commit
     - manual
+  - id: qmlformat
+    name: qmlformat
+    entry: tools/qmlformat.py
+    pass_filenames: true
+    language: system
+    types: [text]
+    files: ^.*\.qml$
+  - id: qmllint
+    name: qmllint
+    entry: qmllint
+    pass_filenames: true
+    require_serial: true
+    language: system
+    types: [text]
+    files: ^.*\.qml$

.tx/config

@@ -1,9 +1,9 @@
 [main]
 host = https://www.transifex.com
 
-[mixxxdj.mixxx2-3]
+[mixxxdj.mixxx2-4]
 file_filter = res/translations/mixxx_<lang>.ts
 source_file = res/translations/mixxx.ts
 source_lang = en
 minimum_perc = 0
-type = TS
+type = QT

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.4.0](https://launchpad.net/mixxx/+milestone/2.4.0) (Unreleased)
+
+* Cover art: Prevent wrong cover art display due to hash conflicts
+* Cover art: Add background color for quick cover art preview
+* Add Random Track Control to AutoDJ [#3076](https://github.com/mixxxdj/mixxx/pull/3076)
+* Add support for saving loops as hotcues [#2194](https://github.com/mixxxdj/mixxx/pull/2194) [lp:1367159](https://bugs.launchpad.net/mixxx/+bug/1367159)
+
 ## [2.3.0](https://launchpad.net/mixxx/+milestone/2.3.0) (Unreleased)
 ### Hotcues ###
 * Add hotcue colors and custom labels by right clicking hotcue buttons or right clicking hotcues on overview waveforms [#2016](https://github.com/mixxxdj/mixxx/pull/2016) [#2520](https://github.com/mixxxdj/mixxx/pull/2520) [#2238](https://github.com/mixxxdj/mixxx/pull/2238) [#2560](https://github.com/mixxxdj/mixxx/pull/2560) [#2557](https://github.com/mixxxdj/mixxx/pull/2557) [#2362](https://github.com/mixxxdj/mixxx/pull/2362)