Skip to content

Commit 4a821e9

Browse files
committed
Merge remote-tracking branch 'upstream/2.6' into LateNight-minimize-decks-and-waveforms-for-vinyl-passthrough
2 parents 29c27ef + 9b291e3 commit 4a821e9

11 files changed

Lines changed: 506 additions & 49 deletions

File tree

.github/workflows/build.yml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,79 @@ jobs:
559559
name: ${{ matrix.artifacts_name }}
560560
path: ${{ matrix.artifacts_path }}
561561

562+
build-flatpak:
563+
name: "Flatpak"
564+
container:
565+
image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.10
566+
options: --privileged
567+
volumes:
568+
- /usr:/host/usr
569+
- /opt:/host/opt
570+
strategy:
571+
matrix:
572+
variant:
573+
- arch: x86_64
574+
runner: ubuntu-24.04
575+
- arch: aarch64
576+
runner: ubuntu-24.04-arm
577+
runs-on: ${{ matrix.variant.runner }}
578+
steps:
579+
- name: "Recover host disk space"
580+
run: |
581+
rm -rf /host/opt/hostedtoolcache/CodeQL
582+
rm -rf /host/opt/hostedtoolcache/go
583+
rm -rf /host/usr/local/lib/android
584+
rm -rf /host/usr/local/.ghcup
585+
rm -rf /host/usr/local/share/powershell
586+
rm -rf /host/usr/share/swift
587+
rm -rf /host/usr/share/dotnet
588+
589+
- name: "Check out repository"
590+
uses: actions/checkout@v6
591+
with:
592+
fetch-depth: 0
593+
594+
- name: "Store Git version"
595+
run: |
596+
git config --global --add safe.directory "${GITHUB_WORKSPACE}"
597+
GIT_DESC=$(git describe --always --first-parent --dirty=-modified)
598+
if [ -z "$GIT_DESC" ]; then
599+
GIT_DESC="unknown"
600+
fi
601+
echo "GIT_DESC=$GIT_DESC" >> $GITHUB_ENV
602+
603+
- name: "Build Flatpak"
604+
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
605+
with:
606+
manifest-path: packaging/flatpak/org.mixxx.Mixxx.yaml
607+
arch: ${{ matrix.variant.arch }}
608+
build-bundle: false
609+
upload-artifact: false
610+
611+
- name: "Create Flatpak bundle"
612+
run: |
613+
flatpak build-bundle repo \
614+
--arch=${{ matrix.variant.arch }} \
615+
Mixxx-${GIT_DESC}-${{ matrix.variant.arch }}.flatpak org.mixxx.Mixxx
616+
617+
- name: "Create Debug extension"
618+
run: |
619+
flatpak build-bundle repo \
620+
--arch=${{ matrix.variant.arch }} \
621+
--runtime Mixxx-${GIT_DESC}-${{ matrix.variant.arch }}.Debug.flatpak org.mixxx.Mixxx.Debug
622+
623+
- name: "Upload Flatpak bundle"
624+
uses: actions/upload-artifact@v6
625+
with:
626+
name: Flatpak ${{ matrix.variant.arch }}
627+
path: Mixxx-${{ env.GIT_DESC }}-${{ matrix.variant.arch }}.flatpak
628+
629+
- name: "Upload Debug extension"
630+
uses: actions/upload-artifact@v6
631+
with:
632+
name: Flatpak Debug Extension ${{ matrix.variant.arch }}
633+
path: Mixxx-${{ env.GIT_DESC }}-${{ matrix.variant.arch }}.Debug.flatpak
634+
562635
update_manifest:
563636
name: "Update manifest file on download server"
564637
runs-on: ubuntu-latest

CHANGELOG.md

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -622,6 +622,93 @@
622622
* README: add link to OS-specific build instructions [#14779](https://github.com/mixxxdj/mixxx/pull/14779)
623623
* Improve debug output for missing WWidget pixmaps [#14473](https://github.com/mixxxdj/mixxx/pull/14473)
624624

625+
## [2.5.5](https://github.com/mixxxdj/mixxx/milestone/53) (Unreleased)
626+
627+
### Library
628+
629+
* Search: fix 'not' operator
630+
[#15923](https://github.com/mixxxdj/mixxx/pull/15923)
631+
[#15918](https://github.com/mixxxdj/mixxx/issues/15918)
632+
* Rhythmbox: fix imports
633+
[#15798](https://github.com/mixxxdj/mixxx/pull/15798)
634+
[#15770](https://github.com/mixxxdj/mixxx/pull/15770)
635+
* WTrackMenu: warn before opening more than 10 tracks in file browser
636+
[#15828](https://github.com/mixxxdj/mixxx/pull/15828)
637+
[#15819](https://github.com/mixxxdj/mixxx/issues/15819)
638+
* Fix "dataChanged() called with an invalid index range" warning
639+
[#15937](https://github.com/mixxxdj/mixxx/pull/15937)
640+
[#14610](https://github.com/mixxxdj/mixxx/issues/14610)
641+
642+
### Effects
643+
644+
* White Noise: remove DC offset [#15979](https://github.com/mixxxdj/mixxx/pull/15979)
645+
* White Noise: improve gain responds [#15949](https://github.com/mixxxdj/mixxx/pull/15949)
646+
* Echo: fix out of bounds read [#15985](https://github.com/mixxxdj/mixxx/pull/15985)
647+
* QuickEffect: fix crackling noise when switching
648+
[#15796](https://github.com/mixxxdj/mixxx/pull/15796)
649+
[#15794](https://github.com/mixxxdj/mixxx/issues/15794)
650+
651+
### Controller Mappings
652+
653+
* Numark Mixtrack 3: update scripts [#14180](https://github.com/mixxxdj/mixxx/pull/14180)
654+
* Pioneer CDJ-350: fix incorrect name in controller mapping [#15683](https://github.com/mixxxdj/mixxx/pull/15683)
655+
* Reloop Beatmix 2/4: implement shift+jog wheel seek
656+
[#15575](https://github.com/mixxxdj/mixxx/pull/15575)
657+
[#12334](https://github.com/mixxxdj/mixxx/issues/12334)
658+
* Traktor Kontrol Z1: fix crossfader cut
659+
[#14451](https://github.com/mixxxdj/mixxx/pull/14451)
660+
[#14450](https://github.com/mixxxdj/mixxx/issues/14450)
661+
[#15945](https://github.com/mixxxdj/mixxx/pull/15945)
662+
* Traktor S4Mk2: check for deck undefined [#14445](https://github.com/mixxxdj/mixxx/pull/14445)
663+
664+
### Controller Backend
665+
666+
* Restore common-hid-packet-parser global symbol exceptions for eslint [#15961](https://github.com/mixxxdj/mixxx/pull/15961)
667+
668+
### Engine
669+
670+
* Fix scratching with keylock enabled and mapping using scracht2 [#15845](https://github.com/mixxxdj/mixxx/pull/15845)
671+
* AudioUnit: fix crash due to off-by-one error in parameter syncing [#15919](https://github.com/mixxxdj/mixxx/pull/15919)
672+
* FX units: resolve issue preventing use on all samplers [#15971](https://github.com/mixxxdj/mixxx/pull/15971)
673+
* AutoDJ: fix wrong use of [Auto DJ] -> [AutoDJ] [#16009](https://github.com/mixxxdj/mixxx/pull/16009)
674+
675+
### Preferences
676+
677+
* Interface: use main window screen to detect if skin fits
678+
[#15824](https://github.com/mixxxdj/mixxx/pull/15824)
679+
[#15823](https://github.com/mixxxdj/mixxx/issues/15823)
680+
681+
### Skins
682+
683+
* Time widget: make ShowSeconds only show seconds, no extra locale info [#15805](https://github.com/mixxxdj/mixxx/pull/15805)
684+
* Search related menu: fix search click trigger [#15912](https://github.com/mixxxdj/mixxx/pull/15912)
685+
* Tracks: avoid re-sorting table when purging/hiding tracks
686+
[#15872](https://github.com/mixxxdj/mixxx/pull/15872)
687+
[#12565](https://github.com/mixxxdj/mixxx/issues/12565)
688+
689+
### Target support
690+
691+
* Add Flatpak packaging files
692+
[#15695](https://github.com/mixxxdj/mixxx/pull/15695)
693+
[#15922](https://github.com/mixxxdj/mixxx/pull/15922)
694+
* Fail early if not running from Visual Studio environment [#14623](https://github.com/mixxxdj/mixxx/pull/14623)
695+
* Make Debian non-free optional [#15895](https://github.com/mixxxdj/mixxx/pull/15895)
696+
* Debian: remove 'qml6-module-qtquick-nativestyle [#15771](https://github.com/mixxxdj/mixxx/pull/15771)
697+
698+
### Miscellaneous
699+
700+
* Bump actions/cache from 4 to 5 [#15756](https://github.com/mixxxdj/mixxx/pull/15756)
701+
* Bump actions/upload-artifact from 5.0.0 to 6.0.0 [#15755](https://github.com/mixxxdj/mixxx/pull/15755)
702+
* Bump azure/trusted-signing-action from 0.5.10 to 1.0.0 [#15884](https://github.com/mixxxdj/mixxx/pull/15884)
703+
* Bump jwlawson/actions-setup-cmake from 2.0 to 2.1 [#15907](https://github.com/mixxxdj/mixxx/pull/15907)
704+
* Fix `mixxx-test` build to find `mad.h` [#15803](https://github.com/mixxxdj/mixxx/pull/15803)
705+
* Disable GitHub cache for VCPKG buildenv to save buildtime [#15981](https://github.com/mixxxdj/mixxx/pull/15981)
706+
* CI: fix issues related to workflow refactor into modular actions [#15750](https://github.com/mixxxdj/mixxx/pull/15750)
707+
* (Belated) Happy New Year 2026! [#15852](https://github.com/mixxxdj/mixxx/pull/15852)
708+
* Retire Ubuntu Plucky Puffin 25.04 [#15926](https://github.com/mixxxdj/mixxx/pull/15926)
709+
* chore(deps): bump azure/trusted-signing-action from 1.0.0 to 1.1.0 [#15990](https://github.com/mixxxdj/mixxx/pull/15990)
710+
* Num deck streamline [#14112](https://github.com/mixxxdj/mixxx/pull/14112)
711+
625712
## [2.5.4](https://github.com/mixxxdj/mixxx/milestone/51) (2025-12-14)
626713

627714
### Controller Mappings

lib/reverb/Reverb.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ void MixxxPlateX2::processBuffer(const sample_t* in, sample_t* out, const uint f
450450
double damp = exp(-M_PI * (.0005+.9995*dampingParam));
451451
tank.damping[0].set(damp);
452452
tank.damping[1].set(damp);
453-
RampingValue<sample_t> send(pow(currentSend, 1.53), previousSend, frames);
453+
RampingValue<sample_t> send(pow(previousSend, 1.53), pow(currentSend, 1.53), frames);
454454

455455
// the modulated lattices interpolate, which needs truncated float
456456
DSP::FPTruncateMode _truncate;

0 commit comments

Comments
 (0)