Skip to content

Commit ba288f6

Browse files
committed
Revert "Merge branch 'mixxxdj:main' into pioneer_ddj-200"
This reverts commit 45e1d26, reversing changes made to dc10e43.
1 parent 45e1d26 commit ba288f6

28 files changed

Lines changed: 257 additions & 1350 deletions

CHANGELOG.md

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -640,23 +640,15 @@
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)
646643

647644
### Effects
648645

649646
* White Noise: remove DC offset [#15979](https://github.com/mixxxdj/mixxx/pull/15979)
650647
* White Noise: improve gain responds [#15949](https://github.com/mixxxdj/mixxx/pull/15949)
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)
648+
* Echo: fix out of bounds read [#15985](https://github.com/mixxxdj/mixxx/pull/15985)
655649
* QuickEffect: fix crackling noise when switching
656650
[#15796](https://github.com/mixxxdj/mixxx/pull/15796)
657651
[#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)
660652

661653
### Controller Mappings
662654

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

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

676-
* Fix scratching with keylock enabled and mapping using scratch2 [#15845](https://github.com/mixxxdj/mixxx/pull/15845)
672+
* Fix scratching with keylock enabled and mapping using scracht2 [#15845](https://github.com/mixxxdj/mixxx/pull/15845)
677673
* AudioUnit: fix crash due to off-by-one error in parameter syncing [#15919](https://github.com/mixxxdj/mixxx/pull/15919)
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)
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)
686676

687677
### Preferences
688678

@@ -703,18 +693,23 @@
703693
* Add Flatpak packaging files
704694
[#15695](https://github.com/mixxxdj/mixxx/pull/15695)
705695
[#15922](https://github.com/mixxxdj/mixxx/pull/15922)
706-
[#15935](https://github.com/mixxxdj/mixxx/pull/15935)
707696
* Fail early if not running from Visual Studio environment [#14623](https://github.com/mixxxdj/mixxx/pull/14623)
708697
* Make Debian non-free optional [#15895](https://github.com/mixxxdj/mixxx/pull/15895)
709698
* 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)
711699

712700
### Miscellaneous
713701

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)
714706
* Fix `mixxx-test` build to find `mad.h` [#15803](https://github.com/mixxxdj/mixxx/pull/15803)
715-
* Num deck streamline
716-
[#14112](https://github.com/mixxxdj/mixxx/pull/14112)
717-
[#16009](https://github.com/mixxxdj/mixxx/pull/16009)
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)
718713

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

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,8 +1265,6 @@ 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
12701268
src/effects/backends/builtin/moogladder4filtereffect.cpp
12711269
src/effects/backends/builtin/compressoreffect.cpp
12721270
src/effects/backends/builtin/autogaincontroleffect.cpp

res/controllers/mixxx-controls.d.ts

Lines changed: 31 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -604,37 +604,7 @@ declare namespace MixxxControls {
604604
* @feedback Deck volume fader
605605
* @kind pot meter control
606606
*/
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';
607+
| `volume${PotMeterSuffix}`;
638608

639609
type ChannelNPreviewDeckNSamplerNControl =
640610
/**
@@ -760,10 +730,6 @@ declare namespace MixxxControls {
760730
/**
761731
* Set a loop that is beatloop_size beats long and enables the loop.
762732
* 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.
767733
* Depending on the state of loop_anchor the loop is created forwards
768734
* or backwards from the current position.
769735
*
@@ -2330,56 +2296,6 @@ declare namespace MixxxControls {
23302296
*/
23312297
| 'stars_down'
23322298

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-
23832299
/**
23842300
* Increase the rating of the currently loaded track (if the skin has star widgets in the decks section).
23852301
*
@@ -2587,6 +2503,36 @@ declare namespace MixxxControls {
25872503
*/
25882504
| `visual_key_distance${PotMeterSuffix}`
25892505

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+
25902536
/**
25912537
* Zooms the waveform to look ahead or back as needed.
25922538
*

0 commit comments

Comments
 (0)