Skip to content

Commit 29526d7

Browse files
committed
Merge remote-tracking branch 'mixxx/2.4' into playlist-sort-keep-selection
2 parents 0a34e4b + 414a8a5 commit 29526d7

410 files changed

Lines changed: 231918 additions & 166391 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-tidy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Checks: >-
1010
readability-qualified-auto
1111
WarningsAsErrors: ""
1212
HeaderFilterRegex: ""
13-
AnalyzeTemporaryDtors: false
1413
FormatStyle: none
1514
User: user
1615
CheckOptions:

.codespellignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ doubleClick
77
sur
88
jus
99
caf
10+
ReflectIn
11+
bufferIn
12+
indexIn
13+
allLocations

.codespellignorelines

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,4 @@ void EngineEffectsDelay::process(CSAMPLE* pInOut,
7272
// Source: FIPS 180-4 Secure Hash Standard (SHS)
7373
// ALAC/CAF has been added in version 1.0.26
7474
QStringLiteral("caf"),
75+
// https://github.com/codders/libshout/blob/a17fb84671d3732317b0353d7281cc47e2df6cf6/src/timing/timing.c

.github/labeler.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ code quality:
2222
- .pre-commit-config.yaml
2323
- pyproject.toml
2424

25-
controllers:
25+
controller backend:
26+
- changed-files:
27+
- any-glob-to-any-file:
28+
- src/controllers/**
29+
30+
controller mappings:
2631
- changed-files:
2732
- any-glob-to-any-file:
2833
- res/controllers/**

.github/workflows/build.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ jobs:
6060
artifacts_path: build/*.deb
6161
artifacts_slug: ubuntu-jammy
6262
qt_qpa_platform: offscreen
63-
- name: macOS 11 x64
64-
os: macos-11
63+
- name: macOS 12 x64
64+
os: macos-12
6565
cmake_args: >-
6666
-DBULK=ON
6767
-DCOREAUDIO=ON
@@ -83,8 +83,8 @@ jobs:
8383
artifacts_path: build/*.dmg
8484
artifacts_slug: macos-macosintel
8585
qt_qpa_platform: offscreen
86-
- name: macOS 11 arm64
87-
os: macos-11
86+
- name: macOS 12 arm64
87+
os: macos-12
8888
cmake_args: >-
8989
-DBULK=ON
9090
-DCOREAUDIO=ON
@@ -151,7 +151,7 @@ jobs:
151151
artifact-windows-win64: ${{ steps.prepare_deploy.outputs.artifact-windows-win64 }}
152152
steps:
153153
- name: "Check out repository"
154-
uses: actions/checkout@v4.1.1
154+
uses: actions/checkout@v4.1.7
155155
with:
156156
# This is necessary for making `git describe` work.
157157
fetch-depth: 0
@@ -332,13 +332,13 @@ jobs:
332332
env:
333333
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
334334
if: runner.os == 'Windows' && env.AZURE_TENANT_ID
335-
uses: azure/azure-code-signing-action@v0.3.0
335+
uses: azure/trusted-signing-action@v0.4.0
336336
with:
337337
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
338338
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
339339
azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
340340
endpoint: https://weu.codesigning.azure.net/
341-
code-signing-account-name: mixxx
341+
trusted-signing-account-name: mixxx
342342
certificate-profile-name: mixxx
343343
files-folder: build
344344
files-folder-filter: exe
@@ -364,7 +364,7 @@ jobs:
364364
run: |
365365
if [[ "${{ github.ref }}" == "refs/heads/main" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
366366
CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/nightlies"
367-
elif [[ "${{ github.ref }}" == "refs/heads/2.4" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
367+
elif [[ "${{ github.ref }}" == "refs/heads/2.5" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
368368
CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/mixxxbetas"
369369
elif [[ "${{ github.ref }}" =~ ^refs/tags/[0-9]+\.[0-9]+\.[0-9]+$ ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
370370
CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/mixxx"
@@ -387,13 +387,13 @@ jobs:
387387
env:
388388
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
389389
if: runner.os == 'Windows' && env.AZURE_TENANT_ID
390-
uses: azure/azure-code-signing-action@v0.3.0
390+
uses: azure/trusted-signing-action@v0.4.0
391391
with:
392392
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
393393
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
394394
azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
395395
endpoint: https://weu.codesigning.azure.net/
396-
code-signing-account-name: mixxx
396+
trusted-signing-account-name: mixxx
397397
certificate-profile-name: mixxx
398398
files-folder: build
399399
files-folder-filter: msi
@@ -489,7 +489,7 @@ jobs:
489489
490490
- name: "Upload GitHub Actions artifacts"
491491
if: matrix.artifacts_path != null
492-
uses: actions/upload-artifact@v4.3.1
492+
uses: actions/upload-artifact@v4.3.4
493493
with:
494494
name: ${{ matrix.artifacts_name }}
495495
path: ${{ matrix.artifacts_path }}
@@ -503,7 +503,7 @@ jobs:
503503
if: always()
504504
steps:
505505
- name: "Check out repository"
506-
uses: actions/checkout@v4.1.1
506+
uses: actions/checkout@v4.1.7
507507
with:
508508
fetch-depth: 0
509509

.markdownlint-cli2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ config:
88

99
# The same headline in different nested sections is okay (and necessary for
1010
# CHANGELOG.md).
11-
no-duplicate-header:
12-
allow_different_nesting: true
11+
no-duplicate-heading:
12+
siblings_only: true
1313

1414
# We use ordered lists to make stuff easier to read in a text editor.
1515
ol-prefix:

.pre-commit-config.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ default_language_version:
3232
rust: 1.64.0
3333
repos:
3434
- repo: https://github.com/pre-commit/pre-commit-hooks
35-
rev: v4.4.0
35+
rev: v4.6.0
3636
hooks:
3737
- id: fix-byte-order-marker
3838
exclude: ^.*(\.cbproj|\.groupproj|\.props|\.sln|\.vcxproj|\.vcxproj.filters|UTF-8-BOM.txt)$
@@ -51,7 +51,7 @@ repos:
5151
# protect main and any branch that has a semver-like name
5252
args: [-b, main, -p, '^\d+\.\d+(?:\.\d+)?$']
5353
- repo: https://github.com/codespell-project/codespell
54-
rev: v2.2.5
54+
rev: v2.3.0
5555
hooks:
5656
- id: codespell
5757
args:
@@ -66,7 +66,7 @@ repos:
6666
]
6767
exclude: ^(packaging/wix/LICENSE.rtf.in|src/dialog/dlgabout\.cpp|.*\.(?:pot?|(?<!d\.)ts|wxl|svg))$
6868
- repo: https://github.com/pre-commit/mirrors-eslint
69-
rev: v8.48.0
69+
rev: v9.8.0
7070
hooks:
7171
- id: eslint
7272
args: [--fix, --report-unused-disable-directives]
@@ -96,35 +96,35 @@ repos:
9696
- clang-format==16.0.6
9797
files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|m|mm|proto|vert)$
9898
- repo: https://github.com/psf/black
99-
rev: 23.7.0
99+
rev: 24.4.2
100100
hooks:
101101
- id: black
102102
files: ^tools/.*$
103103
- repo: https://github.com/pycqa/flake8
104-
rev: "6.1.0"
104+
rev: "7.1.0"
105105
hooks:
106106
- id: flake8
107107
files: ^tools/.*$
108108
types: [text, python]
109109
- repo: https://github.com/shellcheck-py/shellcheck-py
110-
rev: v0.9.0.5
110+
rev: v0.10.0.1
111111
hooks:
112112
- id: shellcheck
113113
- repo: https://github.com/DavidAnson/markdownlint-cli2
114-
rev: v0.9.2
114+
rev: v0.13.0
115115
hooks:
116116
- id: markdownlint-cli2
117117
- repo: https://github.com/python-jsonschema/check-jsonschema
118-
rev: 0.26.3
118+
rev: 0.29.1
119119
hooks:
120120
- id: check-github-workflows
121121
- repo: https://github.com/pre-commit/mirrors-prettier
122-
rev: v3.0.2
122+
rev: v4.0.0-alpha.8
123123
hooks:
124124
- id: prettier
125125
types: [yaml]
126126
- repo: https://github.com/qarmin/qml_formatter.git
127-
rev: 0.2.0
127+
rev: 37c2513b1b8275a475a160ed2f5b044910335d5f # No release tag yet including #6 fix
128128
hooks:
129129
- id: qml_formatter
130130
- repo: local

CHANGELOG.md

Lines changed: 77 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,67 @@
11
# Changelog
22

3-
## [2.4.1](https://github.com/mixxxdj/mixxx/milestone/41?closed=1) (unreleased)
3+
## [2.4.2](https://github.com/mixxxdj/mixxx/milestone/43?closed=1) (unreleased)
4+
5+
### Controller Mappings
6+
7+
* Korg Kaoss DJ: Update script [#12683](https://github.com/mixxxdj/mixxx/pull/12683)
8+
* Novation Dicer: Remove flanger mapping with quickeffect toggle
9+
[#13196](https://github.com/mixxxdj/mixxx/pull/13196)
10+
[#13134](https://github.com/mixxxdj/mixxx/issues/13134)
11+
* Numark PartyMix: Fix EQ (script binding) display name [#13255](https://github.com/mixxxdj/mixxx/pull/13255)
12+
* Numark Scratch: Add initial mapping
13+
[#4834](https://github.com/mixxxdj/mixxx/pull/4834)
14+
[#13375](https://github.com/mixxxdj/mixxx/pull/13375)
15+
* Sony SIXAXIS: Fix mapping [#13319](https://github.com/mixxxdj/mixxx/pull/13319)
16+
17+
### Fixes
18+
19+
* Handle not supported files when dragging to waveforms and spinnies
20+
[#13208](https://github.com/mixxxdj/mixxx/pull/13208)
21+
[#13271](https://github.com/mixxxdj/mixxx/pull/13271)
22+
[#13275](https://github.com/mixxxdj/mixxx/pull/13275)
23+
* Fix Sqlite 3.45 builds by using only single quotes for SQL strings
24+
[#13247](https://github.com/mixxxdj/mixxx/pull/13247)
25+
[#13257](https://github.com/mixxxdj/mixxx/pull/13257)
26+
* LateNight: Use default colors for sampler overviews (like main decks) [#13274](https://github.com/mixxxdj/mixxx/pull/13274)
27+
* Library: Allow to drop files to decks with unsupported or no file extensions
28+
[#13209](https://github.com/mixxxdj/mixxx/pull/13209)
29+
[#13204](https://github.com/mixxxdj/mixxx/issues/13204)
30+
* Update build environment with libdjinterop 0.21.0 [#13288](https://github.com/mixxxdj/mixxx/pull/13288)
31+
* Move to GitHub workflow runner macos-12
32+
[#13296](https://github.com/mixxxdj/mixxx/pull/13296)
33+
[#13248](https://github.com/mixxxdj/mixxx/issues/13248)
34+
* Recording: with empty config, save default split size immediately
35+
[#13304](https://github.com/mixxxdj/mixxx/pull/13304)
36+
* Allow to drop files with supported MIME type regardless off the file extensions
37+
[#13209](https://github.com/mixxxdj/mixxx/pull/13209)
38+
[#13204](https://github.com/mixxxdj/mixxx/issues/13204)
39+
* Add support for Ubuntu Oracular Oriole and remove Lunar Lobster
40+
[#13348](https://github.com/mixxxdj/mixxx/pull/13348)
41+
* Recordbox: Fix string decoding issues
42+
[#13293](https://github.com/mixxxdj/mixxx/pull/13293)
43+
[#13291](https://github.com/mixxxdj/mixxx/issues/13291)
44+
* Mixer preferences: Don't update EQs/QuickEffects while applying [#13333](https://github.com/mixxxdj/mixxx/pull/13333)
45+
* Hardware preferences: Fix UX when applying config with missing/busy devices
46+
[#13312](https://github.com/mixxxdj/mixxx/pull/13312)
47+
* Fix minor 64 bit CPU performance issue [#13355](https://github.com/mixxxdj/mixxx/pull/13355)
48+
* Fix clicks at loop-out when looping into lead-in [#13294](https://github.com/mixxxdj/mixxx/pull/13294)
49+
* Fix wrong pitch value on startup, caused by `components.Pot`
50+
[#11814](https://github.com/mixxxdj/mixxx/issues/11814)
51+
[#13463](https://github.com/mixxxdj/mixxx/pull/13463)
52+
53+
## [2.4.1](https://github.com/mixxxdj/mixxx/milestone/41?closed=1) (2024-05-08)
454

555
### Controller Mappings
656

757
* Behringer DDM4000 & BCR2000: Fix exception in JS code [#12969](https://github.com/mixxxdj/mixxx/pull/12969)
858
* Denon DJ MC6000MK2: Fix mapping of filter knob/button [#13166](https://github.com/mixxxdj/mixxx/pull/13166)
9-
* Denon DJ MC7000: Fix redundant argument and migrate to `hotcue_x_status` [#13113](https://github.com/mixxxdj/mixxx/pull/13113) [#13121](https://github.com/mixxxdj/mixxx/pull/13121)
59+
* Denon DJ MC7000: Fix redundant argument and migrate to `hotcue_x_status`
60+
[#13113](https://github.com/mixxxdj/mixxx/pull/13113)
61+
[#13121](https://github.com/mixxxdj/mixxx/pull/13121)
1062
* Hercules Inpulse 200: Configure shift-browser knob to scroll the library (quick) [#12932](https://github.com/mixxxdj/mixxx/pull/12932)
63+
* Nintendo Wii Remote: Fix hid script regarding addOutput [#12973](https://github.com/mixxxdj/mixxx/pull/12973)
64+
* Pioneer CDJ: Fix hid script regarding addOutput [#12973](https://github.com/mixxxdj/mixxx/pull/12973)
1165
* Pioneer DDJ-FLX4: Add waveform zoom and other mapping improvements
1266
[#12896](https://github.com/mixxxdj/mixxx/pull/12896)
1367
[#12842](https://github.com/mixxxdj/mixxx/pull/12842)
@@ -27,19 +81,30 @@
2781
[#12989](https://github.com/mixxxdj/mixxx/pull/12989)
2882
* CMakeLists: Always prefer OpenGL framework on macOS
2983
[#13080](https://github.com/mixxxdj/mixxx/pull/13080)
84+
* Use capitalized Mixxx in Windows installer and start menu
85+
[#13178](https://github.com/mixxxdj/mixxx/pull/13178)
3086

3187
### Skins
3288

3389
* Deere: make sampler rows persist [#12928](https://github.com/mixxxdj/mixxx/pull/12928)
3490
* Tango: Remove unneeded waveform Singleton [#12938](https://github.com/mixxxdj/mixxx/pull/12938)
91+
* Tango 64: fix Main VU meter
3592
* Prevent possible crash in customs skins using parallel waveforms
3693
[#13043](https://github.com/mixxxdj/mixxx/pull/13043)
3794
[#12580](https://github.com/mixxxdj/mixxx/issues/12580)
3895
[#13136](https://github.com/mixxxdj/mixxx/pull/13136)
3996
* Slider tooltip: consider orientation for up/down shortcut tooltips + add support for WKnobComposed [#13088](https://github.com/mixxxdj/mixxx/pull/13088)
4097
* Tooltips: update 'hotcue' with saved loop features [#12875](https://github.com/mixxxdj/mixxx/pull/12875)
41-
* Animate long press latching of sync button [#12990](https://github.com/mixxxdj/mixxx/pull/12990)
98+
* Animate long press latching of sync button
99+
[#12990](https://github.com/mixxxdj/mixxx/pull/12990)
100+
[#13212](https://github.com/mixxxdj/mixxx/pull/13212)
42101
* Polish fx chain controls [#12805](https://github.com/mixxxdj/mixxx/pull/12805)
102+
* Waveforms: draw loop gradient at the correct position
103+
[#13061](https://github.com/mixxxdj/mixxx/pull/13061)
104+
[#13060](https://github.com/mixxxdj/mixxx/issues/13060)
105+
* Waveform / spinnies: don't take keyboard focus on click
106+
[#13174](https://github.com/mixxxdj/mixxx/pull/13174)
107+
[#13211](https://github.com/mixxxdj/mixxx/pull/13211)
43108

44109
### Library
45110

@@ -63,6 +128,7 @@
63128
* Require a minimum movement before initiating the drag&drop of tracks
64129
[#13135](https://github.com/mixxxdj/mixxx/pull/13135)
65130
[#12902](https://github.com/mixxxdj/mixxx/issues/12902)
131+
[#12979](https://github.com/mixxxdj/mixxx/pull/12979)
66132
* iTunes/Serato/Traktor/Rhythmbox: Print error if library file could not be opened
67133
[#13012](https://github.com/mixxxdj/mixxx/pull/13012)
68134
* Playlists: improve table update after deleting (purging) track files
@@ -71,6 +137,7 @@
71137
* Tracks: select track row when clicking the preview button (only when starting preview)
72138
[#12791](https://github.com/mixxxdj/mixxx/pull/12791)
73139
* Library track menu: show Hide action also in Playlist & Crates [#11901](https://github.com/mixxxdj/mixxx/pull/11901)
140+
* iTunes: Obtain FileAccess before accessing iTunes XML [#13013](https://github.com/mixxxdj/mixxx/pull/13013)
74141

75142
### Miscellaneous
76143

@@ -96,6 +163,10 @@
96163
* Fix FLAC recording on macOS and Windows
97164
[#10880](https://github.com/mixxxdj/mixxx/issues/10880)
98165
[#13154](https://github.com/mixxxdj/mixxx/pull/13154)
166+
* LV Mix EQ: Fix pops when enabling in effect rack
167+
[#13055](https://github.com/mixxxdj/mixxx/issues/13055)
168+
[#13073](https://github.com/mixxxdj/mixxx/pull/13073)
169+
* Fix hid addOutput
99170

100171
## [2.4.0](https://github.com/mixxxdj/mixxx/milestone/15?closed=1) (2024-02-16)
101172

@@ -149,7 +220,7 @@
149220
[#4806](https://github.com/mixxxdj/mixxx/pull/4806)
150221
[#11873](https://github.com/mixxxdj/mixxx/pull/11873)
151222
[#11872](https://github.com/mixxxdj/mixxx/issues/11872)
152-
* Add support for overriding analyzis settings about variable/constant BPM on a per-track basis [#10931](https://github.com/mixxxdj/mixxx/pull/10931)
223+
* Add support for overriding analysis settings about variable/constant BPM on a per-track basis [#10931](https://github.com/mixxxdj/mixxx/pull/10931)
153224
* Add menu for looking up track metadata at Discogs, SoundCloud and LastFM [#4772](https://github.com/mixxxdj/mixxx/pull/4772) [#4836](https://github.com/mixxxdj/mixxx/pull/4836)
154225
* Add "Delete Track Files" action, does "Move to Trash" with Qt >= 5.15
155226
[#4560](https://github.com/mixxxdj/mixxx/pull/4560)
@@ -984,7 +1055,7 @@
9841055
[#11327](https://github.com/mixxxdj/mixxx/issues/11327)
9851056
* LateNight: brighter fx parameter buttons
9861057
[#11397](https://github.com/mixxxdj/mixxx/pull/11397)
987-
* Fix drift in analyzis data after exporting metadata to MP3 files with ID3v1.1 tags
1058+
* Fix drift in analysis data after exporting metadata to MP3 files with ID3v1.1 tags
9881059
[#11168](https://github.com/mixxxdj/mixxx/pull/11168)
9891060
[#11159](https://github.com/mixxxdj/mixxx/issues/11159)
9901061
* Fix broadcasting using Opus encoding
@@ -1375,7 +1446,7 @@
13751446
* Add controller mapping for Denon MC7000 [#2546](https://github.com/mixxxdj/mixxx/pull/2546)
13761447
* Add controller mapping for Stanton DJC.4 [#2607](https://github.com/mixxxdj/mixxx/pull/2607)
13771448
* Fix broadcasting via broadcast/recording input [#9959](https://github.com/mixxxdj/mixxx/issues/9959) [#2743](https://github.com/mixxxdj/mixxx/pull/2743)
1378-
* Only apply ducking gain in manual ducking mode when talkover is enabed [#7668](https://github.com/mixxxdj/mixxx/issues/7668) [#8995](https://github.com/mixxxdj/mixxx/issues/8995) [#8795](https://github.com/mixxxdj/mixxx/issues/8795) [#2759](https://github.com/mixxxdj/mixxx/pull/2759)
1449+
* Only apply ducking gain in manual ducking mode when talkover is enabled [#7668](https://github.com/mixxxdj/mixxx/issues/7668) [#8995](https://github.com/mixxxdj/mixxx/issues/8995) [#8795](https://github.com/mixxxdj/mixxx/issues/8795) [#2759](https://github.com/mixxxdj/mixxx/pull/2759)
13791450
* Ignore MIDI Clock Messages (0xF8) because they are not usable in Mixxx and inhibited the screensaver [#2786](https://github.com/mixxxdj/mixxx/pull/2786)
13801451

13811452
## [2.2.3](https://launchpad.net/mixxx/+milestone/2.2.3) (2019-11-24)

0 commit comments

Comments
 (0)