Skip to content

Commit

Permalink
Merge remote-tracking branch 'mixxx/main' into lib-scan-summary-etc
Browse files Browse the repository at this point in the history
  • Loading branch information
ronso0 committed Nov 5, 2024
2 parents 990ffa4 + 6a9c602 commit 0579a2b
Show file tree
Hide file tree
Showing 728 changed files with 94,079 additions and 167,117 deletions.
2 changes: 2 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ IndentCaseLabels: false
DerivePointerAlignment: false
SpaceAfterTemplateKeyword: false
SpacesBeforeTrailingComments: 1
PackConstructorInitializers: Never
# StatementMacros don't require a trailing semicolon.
# Trailing semicolons should be omitted after these macros
# when compiling with -Wpedantic to avoid warnings.
Expand All @@ -41,6 +42,7 @@ StatementMacros:
- QT_REQUIRE_VERSION
---
Language: ObjC
ObjCBlockIndentWidth: 4
# We exclude Objective-C(++) from the second line-wrapping pass in tools/clang_format.py
# since this pass only applies C++ rules and therefore include the ColumnLimit in the
# 'main' clang-format config here.
Expand Down
4 changes: 4 additions & 0 deletions .codespellignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ doubleClick
sur
jus
caf
ReflectIn
bufferIn
indexIn
allLocations
23 changes: 12 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_METHOD2(process, void(CSAMPLE* pInOut, const int iBufferSize));
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,5 +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
4 changes: 2 additions & 2 deletions .github/workflows/build-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
name: ${{ matrix.name }}
steps:
- name: Check out repository
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.1
- name: Install build dependencies
run: tools/debian_buildenv.sh setup
- name: Create build directory
Expand Down Expand Up @@ -157,7 +157,7 @@ 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
path-to-lcov: build/lcov.info
Expand Down
18 changes: 10 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
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.1
with:
# This is necessary for making `git describe` work.
fetch-depth: 0
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,13 +318,13 @@ jobs:
env:
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
if: runner.os == 'Windows' && env.AZURE_TENANT_ID
uses: azure/azure-code-signing-action@v0.3.0
uses: azure/trusted-signing-action@v0.5.0
with:
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
endpoint: https://weu.codesigning.azure.net/
code-signing-account-name: mixxx
trusted-signing-account-name: mixxx
certificate-profile-name: mixxx
files-folder: build
files-folder-filter: exe
Expand Down Expand Up @@ -371,13 +373,13 @@ jobs:
env:
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
if: runner.os == 'Windows' && env.AZURE_TENANT_ID
uses: azure/azure-code-signing-action@v0.3.0
uses: azure/trusted-signing-action@v0.5.0
with:
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
endpoint: https://weu.codesigning.azure.net/
code-signing-account-name: mixxx
trusted-signing-account-name: mixxx
certificate-profile-name: mixxx
files-folder: build
files-folder-filter: msi
Expand Down Expand Up @@ -473,7 +475,7 @@ jobs:
- name: "Upload GitHub Actions artifacts"
if: matrix.artifacts_path != null
uses: actions/upload-artifact@v4.3.3
uses: actions/upload-artifact@v4.4.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.1
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.1
- 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.1
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/upload-artifact@v4.3.3
uses: actions/upload-artifact@v4.4.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/upload-artifact@v4.3.3
uses: actions/upload-artifact@v4.4.3
with:
name: pre-commit.log
path: /github/home/.cache/pre-commit/pre-commit.log
Expand Down
4 changes: 2 additions & 2 deletions .markdownlint-cli2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ config:

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

# We use ordered lists to make stuff easier to read in a text editor.
ol-prefix:
Expand Down
21 changes: 11 additions & 10 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.4.0
rev: v4.6.0
hooks:
- id: fix-byte-order-marker
exclude: ^.*(\.cbproj|\.groupproj|\.props|\.sln|\.vcxproj|\.vcxproj.filters|UTF-8-BOM.txt)$
Expand All @@ -51,7 +51,7 @@ repos:
# protect main and any branch that has a semver-like name
args: [-b, main, -p, '^\d+\.\d+(?:\.\d+)?$']
- repo: https://github.com/codespell-project/codespell
rev: v2.2.5
rev: v2.3.0
hooks:
- id: codespell
args:
Expand All @@ -66,7 +66,7 @@ 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: v8.48.0
rev: v9.8.0
hooks:
- id: eslint
args: [--fix, --report-unused-disable-directives]
Expand Down Expand Up @@ -96,35 +96,36 @@ repos:
- clang-format==16.0.6
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: 23.7.0
rev: 24.4.2
hooks:
- id: black
files: ^tools/.*$
- repo: https://github.com/pycqa/flake8
rev: "6.1.0"
rev: "7.1.0"
hooks:
- id: flake8
files: ^tools/.*$
types: [text, python]
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.9.0.5
rev: v0.10.0.1
hooks:
- id: shellcheck
- repo: https://github.com/DavidAnson/markdownlint-cli2
rev: v0.9.2
rev: v0.13.0
hooks:
- id: markdownlint-cli2
language_version: lts
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.26.3
rev: 0.29.1
hooks:
- id: check-github-workflows
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.2
rev: v4.0.0-alpha.8
hooks:
- id: prettier
types: [yaml]
- repo: https://github.com/qarmin/qml_formatter.git
rev: 0.2.0
rev: 37c2513b1b8275a475a160ed2f5b044910335d5f # No release tag yet including #6 fix
hooks:
- id: qml_formatter
- repo: local
Expand Down
Loading

0 comments on commit 0579a2b

Please sign in to comment.