Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into feat/add-advanced-s…
Browse files Browse the repository at this point in the history
…tem-load-cos
  • Loading branch information
acolombier committed Nov 25, 2024
2 parents f439645 + 894e96f commit abc4504
Show file tree
Hide file tree
Showing 294 changed files with 28,190 additions and 34,590 deletions.
22 changes: 11 additions & 11 deletions .codespellignorelines
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@
pInOut, pInOut,
CSAMPLE* pInOut,
CSAMPLE* pInOut,
void EnginePregain::process(CSAMPLE* pInOut, const int iBufferSize) {
void EngineDelay::process(CSAMPLE* pInOut, const int iBufferSize) {
void EnginePregain::process(CSAMPLE* pInOut, const std::size_t bufferSize) {
void EngineDelay::process(CSAMPLE* pInOut, const std::size_t bufferSize) {
pInOut[i] = (CSAMPLE) processSample(fbuf1, (double) pInOut[i]);
pInOut[i + 1] = (CSAMPLE) processSample(fbuf2, (double) pInOut[i + 1]);
m_pDelayBuffer[m_iDelayPos] = pInOut[i];
pInOut[i] = m_pDelayBuffer[iDelaySourcePos];
SampleUtil::applyRampingGain(&pInOut[0], m_fPrevGain, 0, iBufferSize / 2);
SampleUtil::applyRampingGain(&pInOut[iBufferSize / 2], 0, totalGain, iBufferSize / 2);
SampleUtil::applyRampingGain(pInOut, m_fPrevGain, totalGain, iBufferSize);
SampleUtil::applyGain(pInOut, totalGain, iBufferSize);
void process(CSAMPLE* pInOut, const int iBufferSize) override;
void process(CSAMPLE* pInOut, const int iBufferSize);
virtual void process(CSAMPLE* pInOut, const int iBufferSize);
SampleUtil::applyRampingGain(&pInOut[0], m_fPrevGain, 0, bufferSize / 2);
SampleUtil::applyRampingGain(&pInOut[bufferSize / 2], 0, totalGain, bufferSize / 2);
SampleUtil::applyRampingGain(pInOut, m_fPrevGain, totalGain, bufferSize);
SampleUtil::applyGain(pInOut, totalGain, bufferSize);
void process(CSAMPLE* pInOut, const std::size_t bufferSize) override;
void process(CSAMPLE* pInOut, const std::size_t bufferSize);
virtual void process(CSAMPLE* pInOut, const std::size_t bufferSize);
"CSAMPLE_GAIN gain%(i)din, CSAMPLE_GAIN gain%(i)dout"
"gain%(i)dout == CSAMPLE_GAIN_ZERO) {"
"pSrc%(i)d, gain%(i)din, gain%(i)dout" % {"i": j}
"(gain%(i)dout - gain%(i)din) / (iNumSamples / 2);"
MOCK_METHOD(void, process, (CSAMPLE * pInOut, const int iBufferSize), (override));
MOCK_METHOD(void, process, (CSAMPLE * pInOut, const std::size_t bufferSize), (override));
const QString kName3 = QStringLiteral("I'm blue, da ba dee");
float m_k2vg; // IIF factor
float m_k2vgNew; // IIF factor
Expand Down Expand Up @@ -71,6 +71,6 @@ void EngineEffectsDelay::process(CSAMPLE* pInOut,
// Source: FIPS 180-4 Secure Hash Standard (SHS)
// ALAC/CAF has been added in version 1.0.26
QStringLiteral("caf"),
void EngineFilter::process(CSAMPLE* pInOut, const int iBufferSize)
void EngineFilter::process(CSAMPLE* pInOut, const size_t bufferSize)
// Note(RRyan/Max Linke):
// https://github.com/codders/libshout/blob/a17fb84671d3732317b0353d7281cc47e2df6cf6/src/timing/timing.c
25 changes: 14 additions & 11 deletions .github/workflows/build-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,17 @@ jobs:
- name: clazy
- name: clang-tidy
- name: coverage
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
name: ${{ matrix.name }}
steps:
- name: Check out repository
uses: actions/[email protected]
uses: actions/[email protected]
- name: Add clazy PPA
if: matrix.name == 'clazy'
# Ubuntu2404 comes with v1.11, which is too old for the Qt6.4 shipped with Ubuntu 24.04
run: |
sudo add-apt-repository ppa:daschuer/clazy
sudo apt update
- name: Install build dependencies
run: tools/debian_buildenv.sh setup
- name: Create build directory
Expand All @@ -34,6 +40,7 @@ jobs:
if: matrix.name == 'clazy'
# Disable optimizations as workaround for Clang 9 bug: https://bugs.llvm.org/show_bug.cgi?id=45034
run: |
clazy --version
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DWARNINGS_FATAL=ON \
Expand Down Expand Up @@ -61,6 +68,8 @@ jobs:
CXX: clazy
- name: Configure (clang-tidy)
if: matrix.name == 'clang-tidy'
# Our code contains the use of infinity(), which Clang >= 18 reports
# as error, if you compile with -fast-math
run: |
cmake \
-DCMAKE_BUILD_TYPE=Debug \
Expand All @@ -81,6 +90,7 @@ jobs:
-DMAD=ON \
-DMODPLUG=ON \
-DWAVPACK=ON \
-DCMAKE_CXX_FLAGS="-Wno-nan-infinity-disabled" \
..
working-directory: build
env:
Expand Down Expand Up @@ -116,13 +126,6 @@ jobs:
working-directory: build
- name: Set up problem matcher
uses: ammaraskar/[email protected]
# Work around https://github.com/actions/runner-images/issues/8659
- name: "Remove GCC 13 from runner image (workaround)"
shell: bash
run: |
sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
sudo apt-get update
sudo apt-get install -y --allow-downgrades libc6=2.35* libc6-dev=2.35* libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
- name: Build
# Do not abort on errors and build/check the whole project
run: cmake --build . -j $(nproc) -- --keep-going
Expand Down Expand Up @@ -157,8 +160,8 @@ jobs:
- name: "Upload Coverage Report to coveralls.io"
if: matrix.name == 'coverage'
continue-on-error: true
uses: coverallsapp/[email protected].0
uses: coverallsapp/[email protected].4
with:
flag-name: ubuntu-22.04
flag-name: ubuntu-24.04
path-to-lcov: build/lcov.info
github-token: ${{ secrets.GITHUB_TOKEN }}
26 changes: 14 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
fail-fast: false
matrix:
include:
- name: Ubuntu 22.04
os: ubuntu-22.04
- name: Ubuntu 24.04
os: ubuntu-24.04
cmake_args: >-
-DQT6=ON
-DQML=ON
Expand All @@ -34,7 +34,7 @@ jobs:
cpack_generator: DEB
buildenv_basepath: /home/runner/buildenv
buildenv_script: tools/debian_buildenv.sh
artifacts_name: Ubuntu 22.04 Qt6 DEB
artifacts_name: Ubuntu 24.04 Qt6 DEB
artifacts_path: build/*.deb
artifacts_slug: ubuntu-jammy
qt_qpa_platform: offscreen
Expand Down Expand Up @@ -121,7 +121,6 @@ jobs:

env:
# macOS codesigning
APPLE_CODESIGN_IDENTITY: EF241CF990A9BE5477438AEE1F308F76F33FD100
MACOS_CODESIGN_CERTIFICATE_P12_BASE64: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_P12_BASE64 }}
MACOS_CODESIGN_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_PASSWORD }}

Expand All @@ -134,7 +133,7 @@ jobs:
artifact-windows-win64: ${{ steps.prepare_deploy.outputs.artifact-windows-win64 }}
steps:
- name: "Check out repository"
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.2
with:
# This is necessary for making `git describe` work.
fetch-depth: 0
Expand All @@ -152,7 +151,7 @@ jobs:

- name: "[macOS] Set up cmake"
uses: jwlawson/[email protected]
# Ubuntu 22.04 should use the CMake version from the repos.
# Ubuntu 24.04 should use the CMake version from the repos.
if: runner.os == 'macOS'
with:
# This should always match the minimum required version in
Expand All @@ -161,7 +160,7 @@ jobs:

- name: "[Windows] Set up cmake"
uses: jwlawson/[email protected]
# Ubuntu 22.04 should use the CMake version from the repos.
# Ubuntu 24.04 should use the CMake version from the repos.
if: runner.os == 'Windows'
with:
# This is a workaround for a SSL false positive in cmake 3.26.4
Expand Down Expand Up @@ -201,12 +200,15 @@ jobs:
security unlock-keychain -p mixxx Mixxx.keychain
security import ~/certificate.p12 -k Mixxx.keychain \
-P "${MACOS_CODESIGN_CERTIFICATE_PASSWORD}" -A
security find-certificate -a -Z Mixxx.keychain
APPLE_CODESIGN_IDENTITY="$(security find-certificate -a -Z Mixxx.keychain | grep ^SHA-1 | cut -d " " -f3 | uniq)"
security set-key-partition-list -S "apple-tool:,apple:" -k mixxx Mixxx.keychain
# Add keychain to search list
security list-keychains -s Mixxx.keychain
# Prevent keychain access from timing out
security set-keychain-settings Mixxx.keychain
echo "CMAKE_ARGS_EXTRA=${CMAKE_ARGS_EXTRA} -DAPPLE_CODESIGN_IDENTITY=${APPLE_CODESIGN_IDENTITY}" >> "${GITHUB_ENV}"
echo "APPLE_CODESIGN_IDENTITY=${APPLE_CODESIGN_IDENTITY}" >> $GITHUB_ENV
- name: "[macOS/Linux] Set up build environment"
if: matrix.buildenv_script != null && runner.os != 'Windows'
Expand Down Expand Up @@ -316,7 +318,7 @@ jobs:
env:
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
if: runner.os == 'Windows' && env.AZURE_TENANT_ID
uses: azure/trusted-signing-action@v0.4.0
uses: azure/trusted-signing-action@v0.5.0
with:
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
Expand Down Expand Up @@ -344,7 +346,7 @@ jobs:

- name: "Package for PPA"
# No need to do the PPA build for both Ubuntu versions
if: matrix.name == 'Ubuntu 22.04'
if: matrix.name == 'Ubuntu 24.04'
run: |
if [[ "${{ github.ref }}" == "refs/heads/main" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then
CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/nightlies"
Expand All @@ -371,7 +373,7 @@ jobs:
env:
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
if: runner.os == 'Windows' && env.AZURE_TENANT_ID
uses: azure/trusted-signing-action@v0.4.0
uses: azure/trusted-signing-action@v0.5.0
with:
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
Expand Down Expand Up @@ -473,7 +475,7 @@ jobs:
- name: "Upload GitHub Actions artifacts"
if: matrix.artifacts_path != null
uses: actions/[email protected].0
uses: actions/[email protected].3
with:
name: ${{ matrix.artifacts_name }}
path: ${{ matrix.artifacts_path }}
Expand All @@ -489,7 +491,7 @@ jobs:
if: always() && github.repository == 'mixxxdj/mixxx'
steps:
- name: "Check out repository"
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.2
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/git.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4.1.7
- uses: actions/checkout@v4.2.2
- name: Block Fixup Commit Merge
uses: 13rac1/[email protected]
6 changes: 3 additions & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
container: holzhaus/mixxx-ci:20220930
steps:
- name: "Check out repository"
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.2
with:
# Unfortunately we need the whole history and can't use a shallow clone
# because the Appstream Metadata hook parses the history to find the
Expand Down Expand Up @@ -67,14 +67,14 @@ jobs:

- name: "Upload patch artifact"
if: failure() && env.UPLOAD_PATCH_FILE != null
uses: actions/[email protected].0
uses: actions/[email protected].3
with:
name: ${{ env.UPLOAD_PATCH_FILE }}
path: ${{ env.UPLOAD_PATCH_FILE }}

- name: "Upload pre-commit.log"
if: failure() && env.UPLOAD_PATCH_FILE == null
uses: actions/[email protected].0
uses: actions/[email protected].3
with:
name: pre-commit.log
path: /github/home/.cache/pre-commit/pre-commit.log
Expand Down
30 changes: 15 additions & 15 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ default_language_version:
rust: 1.64.0
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: fix-byte-order-marker
exclude: ^.*(\.cbproj|\.groupproj|\.props|\.sln|\.vcxproj|\.vcxproj.filters|UTF-8-BOM.txt)$
Expand Down Expand Up @@ -66,18 +66,18 @@ repos:
]
exclude: ^(packaging/wix/LICENSE.rtf.in|src/dialog/dlgabout\.cpp|.*\.(?:pot?|(?<!d\.)ts|wxl|svg))$
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v9.8.0
rev: v9.14.0
hooks:
- id: eslint
args: [--fix, --report-unused-disable-directives]
files: \.m?[jt]s$
types: [file]
stages:
- commit
- pre-commit
- manual
additional_dependencies:
- eslint@^8.48.0
- eslint-plugin-jsdoc@^v46.5.1
- eslint@^9.14.0
- eslint-plugin-jsdoc@^v50.4.3
- "@typescript-eslint/eslint-plugin"
- "@typescript-eslint/parser"
- eslint-plugin-diff@^2.0.3
Expand All @@ -89,19 +89,19 @@ repos:
entry: python tools/clang_format.py
require_serial: true
stages:
- commit
- pre-commit
- manual
language: python
additional_dependencies:
- clang-format==16.0.6
- clang-format==19.1.3
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: 24.4.2
rev: 24.10.0
hooks:
- id: black
files: ^tools/.*$
- repo: https://github.com/pycqa/flake8
rev: "7.1.0"
rev: "7.1.1"
hooks:
- id: flake8
files: ^tools/.*$
Expand All @@ -111,11 +111,11 @@ repos:
hooks:
- id: shellcheck
- repo: https://github.com/DavidAnson/markdownlint-cli2
rev: v0.13.0
rev: v0.14.0
hooks:
- id: markdownlint-cli2
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.29.1
rev: 0.29.4
hooks:
- id: check-github-workflows
- repo: https://github.com/pre-commit/mirrors-prettier
Expand All @@ -141,7 +141,7 @@ repos:
types: [text]
files: ^.*\.qss$
stages:
- commit
- pre-commit
- manual
- id: changelog
name: changelog
Expand All @@ -165,8 +165,8 @@ repos:
pass_filenames: false
language: python
additional_dependencies:
- beautifulsoup4==4.11.1
- lxml==4.9.3
- Markdown==3.4.1
- beautifulsoup4==4.12.3
- lxml==5.3.0
- Markdown==3.7
types: [text]
files: ^(CHANGELOG\.md|res/linux/org\.mixxx\.Mixxx\.metainfo.xml)$
Loading

0 comments on commit abc4504

Please sign in to comment.