Merge remote-tracking branch 'upstream/main' into 2.5-alpha

mixxxdj · Jan 11, 2023 · 6f5ae1a · 6f5ae1a
2 parents ec2d363 + cce89d0
commit 6f5ae1a
Show file tree

Hide file tree

Showing 298 changed files with 7,096 additions and 3,237 deletions.
diff --git a/.clang-format b/.clang-format
@@ -26,7 +26,6 @@ ConstructorInitializerIndentWidth: 8
 ContinuationIndentWidth: 8
 IndentCaseLabels: false
 DerivePointerAlignment: false
-ReflowComments: false
 SpaceAfterTemplateKeyword: false
 SpacesBeforeTrailingComments: 1
 # StatementMacros don't require a trailing semicolon.

diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,80 +1,118 @@
 {
-  "extends": ["eslint:recommended", "plugin:jsdoc/recommended"],
+  "extends": [ "eslint:recommended", "plugin:jsdoc/recommended" ],
   "parserOptions": {
     "ecmaVersion": 7,
     "sourceType": "script"
   },
   "env": {
     "es6": true
   },
-  "plugins": ["jsdoc"],
+  "plugins": [ "jsdoc" ],
+  "settings": {
+    "jsdoc": {
+      "preferredTypes": {
+        "object": "Object"
+      }
+    }
+  },
   "rules": {
-    "array-bracket-spacing" : "warn",
+    "array-bracket-spacing": "warn",
     "block-spacing": "warn",
-    "brace-style": ["warn", "1tbs", {
+    "brace-style": [
+      "warn",
+      "1tbs",
+      {
         "allowSingleLine": true
-    }],
+      }
+    ],
     "curly": "warn",
     "camelcase": "warn",
     "comma-spacing": "warn",
-    "computed-property-spacing" : ["warn", "never", {
+    "computed-property-spacing": [
+      "warn",
+      "never",
+      {
         "enforceForClassMembers": true
-    }],
-    "dot-location": ["warn", "property"],
+      }
+    ],
+    "dot-location": [ "warn", "property" ],
     "dot-notation": "warn",
-    "eqeqeq": ["error", "always"],
+    "eqeqeq": [ "error", "always" ],
     "func-call-spacing": "warn",
-    "func-style": ["error", "expression", {
+    "func-style": [
+      "error",
+      "expression",
+      {
         "allowArrowFunctions": true
-    }],
-    "indent": ["warn", 4],
+      }
+    ],
+    "indent": [ "warn", 4 ],
     "key-spacing": "warn",
     "keyword-spacing": "warn",
-    "linebreak-style": ["warn", "unix"],
+    "linebreak-style": [ "warn", "unix" ],
     "newline-per-chained-call": "warn",
     "no-constructor-return": "warn",
     "no-extra-bind": "warn",
     "no-sequences": "warn",
     "no-useless-call": "warn",
     "no-useless-return": "warn",
     "no-trailing-spaces": "warn",
-    "no-unneeded-ternary": ["warn", {
+    "no-unneeded-ternary": [
+      "warn",
+      {
         "defaultAssignment": false
-    }],
-    "no-unused-vars": ["error", {
+      }
+    ],
+    "no-unused-vars": [
+      "error",
+      {
         "argsIgnorePattern": "^_"
-    }],
+      }
+    ],
     "no-var": "warn",
-    "object-curly-newline" : ["warn", {
+    "object-curly-newline": [
+      "warn",
+      {
         "consistent": true,
         "multiline": true
-    }],
-    "object-curly-spacing" : "warn",
+      }
+    ],
+    "object-curly-spacing": "warn",
     "prefer-const": "warn",
     "prefer-regex-literals": "warn",
-    "quotes": ["warn", "double"],
+    "quotes": [ "warn", "double" ],
     "require-atomic-updates": "error",
     "semi": "warn",
     "semi-spacing": "warn",
-    "space-before-blocks": ["warn", "always"],
-    "space-before-function-paren": ["warn", "never"],
+    "space-before-blocks": [ "warn", "always" ],
+    "space-before-function-paren": [ "warn", "never" ],
     "space-in-parens": "warn",
     "yoda": "warn"
   },
   "globals": {
-    "console": "readable"
+    "console": "readonly"
   },
   "overrides": [
     {
-      "files": ["**/*.mjs"],
+      "files": [ "**/*.mjs" ],
       "parserOptions": {
         "sourceType": "module"
       }
     },
     {
-      "files": ["res/controllers/*.js"],
+      "files": [ "res/controllers/common-hid-packet-parser.js" ],
+      "globals": {
+        "console": "readonly"
+      },
+      "rules": {
+        "camelcase": "off"
+      }
+    },
+    {
+      "files": [ "res/controllers/*.js" ],
+      "excludedFiles": "res/controllers/common-hid-packet-parser.js",
       "globals": {
-        "console": "readable",
+        "console": "readonly",
         "svg": "writable",
         "HIDController": "writable",
         "HIDDebug": "writable",

diff --git a/.gitattributes b/.gitattributes
@@ -23,3 +23,6 @@
 
 # Treat serato test data as binary
 *.octet-stream binary
+
+# shell scripts will always have LF line endings on checkout.
+*.sh text eol=lf
diff --git a/.github/workflows/build-checks.yml b/.github/workflows/build-checks.yml
@@ -6,8 +6,15 @@ on:
   push:
   pull_request:
 
+permissions:
+  contents: read #  to fetch code (actions/checkout)
+
 jobs:
   build-checks:
+    permissions:
+      contents: read #  to fetch code (actions/checkout)
+      checks: write #  to create new checks (coverallsapp/github-action)
+
     strategy:
       matrix:
         include:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,6 +6,9 @@ on:
   push:
   pull_request:
 
+permissions:
+  contents: read #  to fetch code (actions/checkout)
+
 jobs:
   build:
     strategy:
@@ -59,8 +62,8 @@ jobs:
               -DCOREAUDIO=ON
               -DHSS1394=ON
               -DMACOS_BUNDLE=ON
-              -DMODPLUG=OFF
-              -DWAVPACK=OFF
+              -DMODPLUG=ON
+              -DWAVPACK=ON
             # TODO: Fix this broken test on macOS
             ctest_args: --exclude-regex DirectoryDAOTest.relocateDirectory
             cpack_generator: DragNDrop
@@ -432,7 +435,7 @@ jobs:
 
       - name: "Upload GitHub Actions artifacts"
         if: matrix.artifacts_path != null
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
         with:
           name: ${{ matrix.artifacts_name }}
           path: ${{ matrix.artifacts_path }}

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -10,6 +10,7 @@ on:
     paths:
       - "CHANGELOG.md"
 
+permissions: {}
 jobs:
   trigger-changelog-update:
     name: Trigger Changelog update on manual repository

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -6,6 +6,9 @@ on:
   push:
   pull_request:
 
+permissions:
+  contents: read #  to fetch code (actions/checkout)
+
 jobs:
   pre-commit:
     name: Detecting code style issues
@@ -58,16 +61,18 @@ jobs:
         run: |
           git diff-index -p HEAD > "${PATCH_FILE}"
           [ -s "${PATCH_FILE}" ] && echo "UPLOAD_PATCH_FILE=${PATCH_FILE}" >> "${GITHUB_ENV}"
+        shell: bash
         env:
           PATCH_FILE: pre-commit.patch
 
       - name: "Upload patch artifact"
         if: failure() && env.UPLOAD_PATCH_FILE != null
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v3.1.2
         with:
           name: ${{ env.UPLOAD_PATCH_FILE }}
           path: ${{ env.UPLOAD_PATCH_FILE }}
 
       # AppStream metadata has been generated/updated by a pre-commit hook
       - name: "Validate AppStream metadata"
+        if: runner.os == 'Linux'
         run: appstreamcli validate res/linux/org.mixxx.Mixxx.metainfo.xml
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=https://json.schemastore.org/github-workflow
 
-name: "Detect stale issues"
+name: "Detect stale issues and pull request"
 on:
   schedule:
     - cron: "0 0 * * *"
@@ -15,13 +15,16 @@ jobs:
       pull-requests: write # for actions/stale to close stale PRs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v7
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          stale-issue-message: "This issue is marked as stale because it has been open 90 days with no activity."
-          stale-issue-label: "stale"
           stale-pr-message: "This PR is marked as stale because it has been open 90 days with no activity."
           stale-pr-label: "stale"
-          days-before-stale: 90
-          days-before-close: -1
+          days-before-pr-stale: 90
+          days-before-pr-close: -1
           exempt-pr-labels: "needs review"
+          close-issue-message: "Expired for Mixxx because there has been no activity for 60 days."
+          stale-issue-label: "stale"
+          days-before-issue-stale: 60
+          days-before-issue-close: 0
+          only-issue-labels: "incomplete"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -79,20 +79,22 @@ repos:
       - id: clang-format
         name: clang-format
         description: "Run clang-format in two passes (reformat, then break long lines)"
-        entry: tools/clang_format.py
+        entry: python tools/clang_format.py
         require_serial: true
         stages:
           - commit
           - manual
         language: python
+        additional_dependencies:
+          - clang-format==14.0.6
         files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|m|mm|proto|vert)$
   - repo: https://github.com/psf/black
     rev: 22.10.0
     hooks:
       - id: black
         files: ^tools/.*$
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: "3.9.2"
+  - repo: https://github.com/pycqa/flake8
+    rev: "5.0.4"
     hooks:
       - id: flake8
         files: ^tools/.*$
@@ -119,7 +121,7 @@ repos:
       - id: qsscheck
         name: qsscheck
         description: Run qsscheck to detect broken QSS.
-        entry: ./tools/qsscheck.py
+        entry: python tools/qsscheck.py
         args: [.]
         pass_filenames: false
         language: python
@@ -133,15 +135,15 @@ repos:
       - id: changelog
         name: changelog
         description: Add missing links to changelog.
-        entry: ./tools/changelog.py
+        entry: python tools/changelog.py
         language: python
         types: [text]
         files: ^CHANGELOG.md$
       - id: qmlformat
         name: qmlformat
-        entry: tools/qmlformat.py
+        entry: python tools/qmlformat.py
         pass_filenames: true
-        language: system
+        language: python
         types: [text]
         files: ^.*\.qml$
       - id: qmllint
@@ -155,12 +157,12 @@ repos:
       - id: metainfo
         name: metainfo
         description: Update AppStream metainfo releases from CHANGELOG.md.
-        entry: ./tools/update_metainfo.py
+        entry: python tools/update_metainfo.py
         pass_filenames: false
         language: python
         additional_dependencies:
           - beautifulsoup4==4.11.1
           - lxml==4.9.1
-          - Markdown==3.3.4
+          - Markdown==3.4.1
         types: [text]
         files: ^(CHANGELOG\.md|res/linux/org\.mixxx\.Mixxx\.metainfo.xml)$
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -849,27 +849,47 @@
 
 ## [2.3.4](https://launchpad.net/mixxx/+milestone/2.3.4) (unreleased)
 
-* Controller Preferences: Fix some usability issues [#10821](https://github.com/mixxxdj/mixxx/pull/10821)
-* Track Properties: show 'date added' as local time [#4838](https://github.com/mixxxdj/mixxx/pull/4838) [lp:1980658](https://bugs.launchpad.net/mixxx/+bug/1980658)
-* Numark DJ2GO2: Fix  sliders and knobs [#4835](https://github.com/mixxxdj/mixxx/pull/4835) [lp:1948596](https://bugs.launchpad.net/mixxx/+bug/1948596)
-* Numark DJ2Go2: support HotCue clear with pad [#10841](https://github.com/mixxxdj/mixxx/pull/10841)
+* Numark DJ2GO2: Fix sliders and knobs [#4835](https://github.com/mixxxdj/mixxx/pull/4835) [lp:1948596](https://bugs.launchpad.net/mixxx/+bug/1948596)
+* Numark DJ2Go2: Support HotCue clear with pad [#10841](https://github.com/mixxxdj/mixxx/pull/10841)
 * Numark DJ2Go2: Fix inverted tempo fader [#10852](https://github.com/mixxxdj/mixxx/pull/10852) [#10586](https://github.com/mixxxdj/mixxx/issues/10586)
+* Numark Party Mix: Mapping added [#4720](https://github.com/mixxxdj/mixxx/pull/4720)
+* Numark N4: Inverted pitch slider, to match the GUI orientation [#11057](https://github.com/mixxxdj/mixxx/pull/11046)
 * Ableton Push: Show as one device [#10905](https://github.com/mixxxdj/mixxx/pull/10905)
+* Traktor S3: Fix issues with sampler and hotcue buttons [#4676](https://github.com/mixxxdj/mixxx/pull/4676)
 * Potmeters: Add support for arbitrary maximums in 7-/14-bit handlers from controller scripts [#4495](https://github.com/mixxxdj/mixxx/pull/4495)
+* Controller Preferences: Fix some usability issues [#10821](https://github.com/mixxxdj/mixxx/pull/10821)
+* Track Properties: Show 'date added' as local time [#4838](https://github.com/mixxxdj/mixxx/pull/4838) [lp:1980658](https://bugs.launchpad.net/mixxx/+bug/1980658)
 * Shade: Fix library sidebar splitter glitch [#4828](https://github.com/mixxxdj/mixxx/pull/4828) [lp:1979823](https://bugs.launchpad.net/mixxx/+bug/1979823)
+* LateNight: Add a border to the crossfader when Auto DJ is active. [#10913](https://github.com/mixxxdj/mixxx/pull/10913)
 * macOS builds: Perform ad-hoc signing of macOS bundle in Pull request and personal repositories [#4774](https://github.com/mixxxdj/mixxx/pull/4774)
 * Waveform: Avoid visual glitch with ranges < 1 px [#4804](https://github.com/mixxxdj/mixxx/pull/4804)
-* Traktor S3: Fix issues with sampler and hotcue buttons [#4676](https://github.com/mixxxdj/mixxx/pull/4676)
 * Build Mixxx on macOS 11, replacing deprecated macOS 10.15 [#4863](https://github.com/mixxxdj/mixxx/pull/4863)
-* EQ preferences: properly restore 'One EQ for all decks' setting [#4886](https://github.com/mixxxdj/mixxx/pull/4886)
+* Add macOS 13.0 (Ventura) support, by using portaudio 19.7.0  [#11046](https://github.com/mixxxdj/mixxx/pull/11046)
+* EQ preferences: Properly restore 'One EQ for all decks' setting [#4886](https://github.com/mixxxdj/mixxx/pull/4886)
 * MC7000: Fix off-by-one indexing in the controller script [#4902](https://github.com/mixxxdj/mixxx/pull/4902)
 * Cover Art: Fix picking wrong cover file, when track file name contains extra dots [#4909](https://github.com/mixxxdj/mixxx/pull/4909)
 * MusicBrainz: Respect rate limits [#10874](https://github.com/mixxxdj/mixxx/pull/10874) [#10795](https://github.com/mixxxdj/mixxx/issues/10795)
 * MusicBrainz: Stop fetching after closing the dialog [#10878](https://github.com/mixxxdj/mixxx/pull/10878) [#10877](https://github.com/mixxxdj/mixxx/issues/10877)
+* MusicBrainz: Fixed stalled GUI after client timeout [#10875](https://github.com/mixxxdj/mixxx/pull/10875) [#10883](https://github.com/mixxxdj/mixxx/issues/10883)
 * macOs: Fix frozen skin control after Ctrl-Click [#10869](https://github.com/mixxxdj/mixxx/pull/10869) [10831](https://github.com/mixxxdj/mixxx/issues/10831)
 * Avoid redundant messages boxes after track loading fails [#10889](https://github.com/mixxxdj/mixxx/pull/10889)
-* Use OpenGL VU meter widgets. This aims to improve performaces with macOS. [#10893](https://github.com/mixxxdj/mixxx/pull/10893)
+* Use OpenGL VU meter widgets. This aims to improve performaces with macOS.
+  [#10893](https://github.com/mixxxdj/mixxx/pull/10893)
+  [#11052](https://github.com/mixxxdj/mixxx/pull/11052)
+  [#10979](https://github.com/mixxxdj/mixxx/pull/10979)
+  [#10973](https://github.com/mixxxdj/mixxx/pull/10973)
+  [#10983](https://github.com/mixxxdj/mixxx/pull/10983)
 * Prevent wild numbers from appearing during scratching under vinyl control. [#10916](https://github.com/mixxxdj/mixxx/pull/10916)
+* Rekordbox: Fix missing playlists due to invalid child ID [#10955](https://github.com/mixxxdj/mixxx/pull/10955)
+* Fixed a possible crash due to a race condition when editing cue points. [#10976](https://github.com/mixxxdj/mixxx/pull/10976) [#10689](https://github.com/mixxxdj/mixxx/issues/10689)
+* Fixed a possible crash when overing cue point via mouse in the waveforms. [#10960](https://github.com/mixxxdj/mixxx/pull/10960) [#10956](https://github.com/mixxxdj/mixxx/issues/10956)
+* History: Disallow dropping tracks. [#10969](https://github.com/mixxxdj/mixxx/pull/10969) [#10250](https://github.com/mixxxdj/mixxx/issues/10250)
+* WTrackMenu: Sort crates and playlists like in sidebar. [#11023](https://github.com/mixxxdj/mixxx/pull/11023)
+* WCoverArtLabel: Don't open full-size cover if no cover is loaded, to avoid an issue when closing. [#11022](https://github.com/mixxxdj/mixxx/pull/11022) [#11021](https://github.com/mixxxdj/mixxx/issues/11021)
+* Removed integer truncation of the position when reading cue points from the database. [#10998](https://github.com/mixxxdj/mixxx/pull/10998)
+* Auto DJ: Added a warning ina message box when it is started without decks with left and a right crossfader orientation [#11018](https://github.com/mixxxdj/mixxx/pull/11018)
+* Fixed crash with FFmpeg decoder [#11044](https://github.com/mixxxdj/mixxx/pull/11044)
+* Fixed issue with finding moved library tracks. [#11051](https://github.com/mixxxdj/mixxx/pull/11051)
 
 ### Packaging