Skip to content

Commit 45e1d26

Browse files
authored
Merge branch 'mixxxdj:main' into pioneer_ddj-200
2 parents dc10e43 + 634e94a commit 45e1d26

28 files changed

Lines changed: 1350 additions & 257 deletions

CHANGELOG.md

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -640,15 +640,23 @@
640640
* Fix "dataChanged() called with an invalid index range" warning
641641
[#15937](https://github.com/mixxxdj/mixxx/pull/15937)
642642
[#14610](https://github.com/mixxxdj/mixxx/issues/14610)
643+
* History: allow track file export [#16074](https://github.com/mixxxdj/mixxx/pull/16074)
644+
* History: prevent deletion of current history after purging tracks [#15991](https://github.com/mixxxdj/mixxx/pull/15991)
645+
* Tracks: improve performance when restoring large track selections [#15973](https://github.com/mixxxdj/mixxx/pull/15973)
643646

644647
### Effects
645648

646649
* White Noise: remove DC offset [#15979](https://github.com/mixxxdj/mixxx/pull/15979)
647650
* White Noise: improve gain responds [#15949](https://github.com/mixxxdj/mixxx/pull/15949)
648-
* Echo: fix out of bounds read [#15985](https://github.com/mixxxdj/mixxx/pull/15985)
651+
* Echo: fix distortion bug
652+
[#15985](https://github.com/mixxxdj/mixxx/pull/15985)
653+
[#15835](https://github.com/mixxxdj/mixxx/issues/15835)
654+
* Echo: fix ramping of the send and feedback parameters [#16006](https://github.com/mixxxdj/mixxx/pull/16006)
649655
* QuickEffect: fix crackling noise when switching
650656
[#15796](https://github.com/mixxxdj/mixxx/pull/15796)
651657
[#15794](https://github.com/mixxxdj/mixxx/issues/15794)
658+
* Glitch: remove unnecessary cast to integer [#16068](https://github.com/mixxxdj/mixxx/pull/16068)
659+
* Reverb: fix ramping of the send parameter [#16001](https://github.com/mixxxdj/mixxx/pull/16001)
652660

653661
### Controller Mappings
654662

@@ -663,16 +671,18 @@
663671
[#15945](https://github.com/mixxxdj/mixxx/pull/15945)
664672
* Traktor S4Mk2: check for deck undefined [#14445](https://github.com/mixxxdj/mixxx/pull/14445)
665673

666-
### Controller Backend
667-
668-
* Restore common-hid-packet-parser global symbol exceptions for eslint [#15961](https://github.com/mixxxdj/mixxx/pull/15961)
669-
670674
### Engine
671675

672-
* Fix scratching with keylock enabled and mapping using scracht2 [#15845](https://github.com/mixxxdj/mixxx/pull/15845)
676+
* Fix scratching with keylock enabled and mapping using scratch2 [#15845](https://github.com/mixxxdj/mixxx/pull/15845)
673677
* AudioUnit: fix crash due to off-by-one error in parameter syncing [#15919](https://github.com/mixxxdj/mixxx/pull/15919)
674-
* FX units: resolve issue preventing use on all samplers [#15971](https://github.com/mixxxdj/mixxx/pull/15971)
675-
* AutoDJ: fix wrong use of [Auto DJ] -> [AutoDJ] [#16009](https://github.com/mixxxdj/mixxx/pull/16009)
678+
* AudioUnit: fix startup crash by loading out-of-process [#16106](https://github.com/mixxxdj/mixxx/pull/16106)
679+
* FX units: resolve issue preventing use on all samplers
680+
[#15971](https://github.com/mixxxdj/mixxx/pull/15971)
681+
[#15799](https://github.com/mixxxdj/mixxx/issues/15799)
682+
* Fix false positive "First sound has been moved!" warnings log message [#16054](https://github.com/mixxxdj/mixxx/pull/16054)
683+
* Beats: fix rare off-by-one beat issue with quantize and sync
684+
[#13262](https://github.com/mixxxdj/mixxx/pull/13262)
685+
[#16086](https://github.com/mixxxdj/mixxx/pull/16086)
676686

677687
### Preferences
678688

@@ -693,23 +703,18 @@
693703
* Add Flatpak packaging files
694704
[#15695](https://github.com/mixxxdj/mixxx/pull/15695)
695705
[#15922](https://github.com/mixxxdj/mixxx/pull/15922)
706+
[#15935](https://github.com/mixxxdj/mixxx/pull/15935)
696707
* Fail early if not running from Visual Studio environment [#14623](https://github.com/mixxxdj/mixxx/pull/14623)
697708
* Make Debian non-free optional [#15895](https://github.com/mixxxdj/mixxx/pull/15895)
698709
* Debian: remove 'qml6-module-qtquick-nativestyle [#15771](https://github.com/mixxxdj/mixxx/pull/15771)
710+
* Ubuntu: retire Plucky Puffin 25.04 [#15926](https://github.com/mixxxdj/mixxx/pull/15926)
699711

700712
### Miscellaneous
701713

702-
* Bump actions/cache from 4 to 5 [#15756](https://github.com/mixxxdj/mixxx/pull/15756)
703-
* Bump actions/upload-artifact from 5.0.0 to 6.0.0 [#15755](https://github.com/mixxxdj/mixxx/pull/15755)
704-
* Bump azure/trusted-signing-action from 0.5.10 to 1.0.0 [#15884](https://github.com/mixxxdj/mixxx/pull/15884)
705-
* Bump jwlawson/actions-setup-cmake from 2.0 to 2.1 [#15907](https://github.com/mixxxdj/mixxx/pull/15907)
706714
* Fix `mixxx-test` build to find `mad.h` [#15803](https://github.com/mixxxdj/mixxx/pull/15803)
707-
* Disable GitHub cache for VCPKG buildenv to save buildtime [#15981](https://github.com/mixxxdj/mixxx/pull/15981)
708-
* CI: fix issues related to workflow refactor into modular actions [#15750](https://github.com/mixxxdj/mixxx/pull/15750)
709-
* (Belated) Happy New Year 2026! [#15852](https://github.com/mixxxdj/mixxx/pull/15852)
710-
* Retire Ubuntu Plucky Puffin 25.04 [#15926](https://github.com/mixxxdj/mixxx/pull/15926)
711-
* chore(deps): bump azure/trusted-signing-action from 1.0.0 to 1.1.0 [#15990](https://github.com/mixxxdj/mixxx/pull/15990)
712-
* Num deck streamline [#14112](https://github.com/mixxxdj/mixxx/pull/14112)
715+
* Num deck streamline
716+
[#14112](https://github.com/mixxxdj/mixxx/pull/14112)
717+
[#16009](https://github.com/mixxxdj/mixxx/pull/16009)
713718

714719
## [2.5.4](https://github.com/mixxxdj/mixxx/milestone/51) (2025-12-14)
715720

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,6 +1265,8 @@ add_library(
12651265
src/effects/backends/builtin/loudnesscontoureffect.cpp
12661266
src/effects/backends/builtin/metronomeeffect.cpp
12671267
src/effects/backends/builtin/metronomeclick.cpp
1268+
src/effects/backends/builtin/keycomparisoneffect.cpp
1269+
src/effects/backends/builtin/pianosample.cpp
12681270
src/effects/backends/builtin/moogladder4filtereffect.cpp
12691271
src/effects/backends/builtin/compressoreffect.cpp
12701272
src/effects/backends/builtin/autogaincontroleffect.cpp

res/controllers/mixxx-controls.d.ts

Lines changed: 85 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,37 @@ declare namespace MixxxControls {
604604
* @feedback Deck volume fader
605605
* @kind pot meter control
606606
*/
607-
| `volume${PotMeterSuffix}`;
607+
| `volume${PotMeterSuffix}`
608+
609+
/**
610+
* Outputs the current instantaneous deck volume (or stem volume for [ChannelN_StemM])
611+
*
612+
* @groups [ChannelN], [ChannelN_StemM], [PreviewDeckN], [SamplerN]
613+
* @range default
614+
* @feedback Deck VU meter
615+
* @since New in version 2.4.0: Replaces the deprecated [ChannelN],VuMeter, [PreviewDeckN],VuMeter and [SamplerN],VuMeter controls.
616+
*/
617+
| 'vu_meter'
618+
619+
/**
620+
* Outputs the current instantaneous deck volume for the left channel (or stem volume for [ChannelN_StemM])
621+
*
622+
* @groups [ChannelN], [ChannelN_StemM], [PreviewDeckN], [SamplerN]
623+
* @range default
624+
* @feedback Deck VU meter L
625+
* @since New in version 2.4.0: Replaces the deprecated [ChannelN],VuMeterL, [PreviewDeckN],VuMeterL and [SamplerN],VuMeterL controls.
626+
*/
627+
| 'vu_meter_left'
628+
629+
/**
630+
* Outputs the current instantaneous deck volume for the right channel (or stem volume for [ChannelN_StemM])
631+
*
632+
* @groups [ChannelN], [ChannelN_StemM], [PreviewDeckN], [SamplerN]
633+
* @range default
634+
* @feedback Deck VU meter R
635+
* @since New in version 2.4.0: Replaces the deprecated [ChannelN],VuMeterR, [PreviewDeckN],VuMeterR and [SamplerN],VuMeterR controls.
636+
*/
637+
| 'vu_meter_right';
608638

609639
type ChannelNPreviewDeckNSamplerNControl =
610640
/**
@@ -730,6 +760,10 @@ declare namespace MixxxControls {
730760
/**
731761
* Set a loop that is beatloop_size beats long and enables the loop.
732762
* If the loaded track has no beat grid, seconds are used instead of beats.
763+
* If there is a rolling beatloop active (beatlooproll_activate
764+
* or beatlooproll_X_activate),
765+
* adopt that loop and quit slip mode. Releasing the rolling beatloop controls will have
766+
* no effect on the play position or loop state.
733767
* Depending on the state of loop_anchor the loop is created forwards
734768
* or backwards from the current position.
735769
*
@@ -2296,6 +2330,56 @@ declare namespace MixxxControls {
22962330
*/
22972331
| 'stars_down'
22982332

2333+
/**
2334+
* Give the currently loaded track a rating of 5 stars.
2335+
*
2336+
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
2337+
* @range binary
2338+
* @feedback Star count is adjusted in the deck’s star widget and in the library table.
2339+
* @since New in version 2.7.0.
2340+
*/
2341+
| 'stars_five'
2342+
2343+
/**
2344+
* Give the currently loaded track a rating of 4 stars.
2345+
*
2346+
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
2347+
* @range binary
2348+
* @feedback Star count is adjusted in the deck’s star widget and in the library table.
2349+
* @since New in version 2.7.0.
2350+
*/
2351+
| 'stars_four'
2352+
2353+
/**
2354+
* Give the currently loaded track a rating of 1 star.
2355+
*
2356+
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
2357+
* @range binary
2358+
* @feedback Star count is adjusted in the deck’s star widget and in the library table.
2359+
* @since New in version 2.7.0.
2360+
*/
2361+
| 'stars_one'
2362+
2363+
/**
2364+
* Give the currently loaded track a rating of 3 stars.
2365+
*
2366+
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
2367+
* @range binary
2368+
* @feedback Star count is adjusted in the deck’s star widget and in the library table.
2369+
* @since New in version 2.7.0.
2370+
*/
2371+
| 'stars_three'
2372+
2373+
/**
2374+
* Give the currently loaded track a rating of 2 stars.
2375+
*
2376+
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
2377+
* @range binary
2378+
* @feedback Star count is adjusted in the deck’s star widget and in the library table.
2379+
* @since New in version 2.7.0.
2380+
*/
2381+
| 'stars_two'
2382+
22992383
/**
23002384
* Increase the rating of the currently loaded track (if the skin has star widgets in the decks section).
23012385
*
@@ -2503,36 +2587,6 @@ declare namespace MixxxControls {
25032587
*/
25042588
| `visual_key_distance${PotMeterSuffix}`
25052589

2506-
/**
2507-
* Outputs the current instantaneous deck volume
2508-
*
2509-
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
2510-
* @range default
2511-
* @feedback Deck VU meter
2512-
* @since New in version 2.4.0: Replaces the deprecated [ChannelN],VuMeter, [PreviewDeckN],VuMeter and [SamplerN],VuMeter controls.
2513-
*/
2514-
| 'vu_meter'
2515-
2516-
/**
2517-
* Outputs the current instantaneous deck volume for the left channel
2518-
*
2519-
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
2520-
* @range default
2521-
* @feedback Deck VU meter L
2522-
* @since New in version 2.4.0: Replaces the deprecated [ChannelN],VuMeterL, [PreviewDeckN],VuMeterL and [SamplerN],VuMeterL controls.
2523-
*/
2524-
| 'vu_meter_left'
2525-
2526-
/**
2527-
* Outputs the current instantaneous deck volume for the right channel
2528-
*
2529-
* @groups [ChannelN], [PreviewDeckN], [SamplerN]
2530-
* @range default
2531-
* @feedback Deck VU meter R
2532-
* @since New in version 2.4.0: Replaces the deprecated [ChannelN],VuMeterR, [PreviewDeckN],VuMeterR and [SamplerN],VuMeterR controls.
2533-
*/
2534-
| 'vu_meter_right'
2535-
25362590
/**
25372591
* Zooms the waveform to look ahead or back as needed.
25382592
*

0 commit comments

Comments
 (0)