Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/2.4' into korg-kaoss-dj
Browse files Browse the repository at this point in the history
  • Loading branch information
daschuer committed Feb 4, 2024
2 parents 18e8199 + 82c0ba2 commit d81b1b3
Show file tree
Hide file tree
Showing 2,258 changed files with 252,070 additions and 354,318 deletions.
14 changes: 11 additions & 3 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
---
Checks: "-*,modernize-use-bool-literals,modernize-use-nullptr,modernize-use-override,readability-braces-around-statements,readability-namespace-comment,readability-non-const-parameter,readability-qualified-auto"
Checks: >-
-*,
google-readability-namespace-comments,
modernize-use-bool-literals,
modernize-use-nullptr,
modernize-use-override,
readability-braces-around-statements,
readability-non-const-parameter,
readability-qualified-auto
WarningsAsErrors: ""
HeaderFilterRegex: ""
AnalyzeTemporaryDtors: false
Expand All @@ -8,9 +16,9 @@ User: user
CheckOptions:
- key: readability-braces-around-statements.ShortStatementLines
value: 0
- key: readability-namespace-comments.ShortNamespaceLines
- key: google-readability-namespace-comments.ShortNamespaceLines
value: 0
- key: readability-namespace-comments.SpacesBeforeComments
- key: google-readability-namespace-comments.SpacesBeforeComments
value: 1
- key: readability-qualified-auto.AddConstToQualified
value: true
Expand Down
1 change: 1 addition & 0 deletions .codespellignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ sord
doubleClick
sur
jus
caf
9 changes: 9 additions & 0 deletions .codespellignorelines
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,12 @@ void EngineEffectsDelay::process(CSAMPLE* pInOut,
mixxx::SampleBuffer pInOut(bufferSizeInSamples);
SampleUtil::fill(pInOut.data(), 0.0f, bufferSizeInSamples);
effectsDelay.process(pInOut.data(), bufferSizeInSamples);
} else if (!strcmp(pavInputFormat->name, "caf")) {
list.append("caf");
// Adopted from Csound code at http://www.kunstmusik.com/udo/cache/moogladder.udo
<< "-alac.caf"
// Test fails for file type "caf" supported by SoundSourceSndfile
//QStringLiteral("caf"),
// Source: FIPS 180-4 Secure Hash Standard (SHS)
// ALAC/CAF has been added in version 1.0.26
QStringLiteral("caf"),
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
res/controllers/lodash.mixxx.js
res/controllers/Novation-Launchpad MK2-scripts.js
res/controllers/Novation-Launchpad Mini MK3-scripts.js
res/controllers/Novation-Launchpad-scripts.js
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"extends": [ "eslint:recommended",
"plugin:jsdoc/recommended"],
"plugin:jsdoc/recommended",
"plugin:diff/diff"],

"parser": "@typescript-eslint/parser",
"parserOptions": {
Expand Down
143 changes: 125 additions & 18 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,136 @@
build:
- default.nix
- CMakeLists.txt
- build/**
- cmake/**
- changed-files:
- any-glob-to-any-file:
- default.nix
- CMakeLists.txt
- build/**
- cmake/**

cmake:
- changed-files:
- any-glob-to-any-file:
- cmake/**

code quality:
- src/test/**
- .clang-format
- .codespell
- .eslint*
- .flake8
- .pre-commit-config.yaml
- pyproject.toml
- changed-files:
- any-glob-to-any-file:
- src/test/**
- .clang-format
- .codespell
- .eslint*
- .flake8
- .pre-commit-config.yaml
- pyproject.toml

controllers:
- res/controllers/**
- changed-files:
- any-glob-to-any-file:
- res/controllers/**

analyzer:
- changed-files:
- any-glob-to-any-file:
- src/analyzer/**

broadcast:
- changed-files:
- any-glob-to-any-file:
- src/broadcast/**

effects:
- changed-files:
- any-glob-to-any-file:
- src/effects/**

engine:
- changed-files:
- any-glob-to-any-file:
- src/engine/**

sync:
- changed-files:
- any-glob-to-any-file:
- src/engine/sync/**

library:
- src/library/**
- changed-files:
- any-glob-to-any-file:
- src/library/**

autodj:
- changed-files:
- any-glob-to-any-file:
- src/library/autodj/**

browse:
- changed-files:
- any-glob-to-any-file:
- src/library/browse/**

itunes:
- changed-files:
- any-glob-to-any-file:
- src/library/itunes/**

rekordbox:
- changed-files:
- any-glob-to-any-file:
- src/library/rekordbox/**

scanner:
- changed-files:
- any-glob-to-any-file:
- src/library/scanner/**

search:
- changed-files:
- any-glob-to-any-file:
- src/library/searchquery*

serato:
- changed-files:
- any-glob-to-any-file:
- src/library/serato/**

packaging:
- changed-files:
- any-glob-to-any-file:
- packaging/**

preferences:
- changed-files:
- any-glob-to-any-file:
- src/preferences/**

skins:
- res/skins/**
- changed-files:
- any-glob-to-any-file:
- res/skins/**

soundio:
- changed-files:
- any-glob-to-any-file:
- src/soundio/**

soundsource:
- changed-files:
- any-glob-to-any-file:
- src/sources/soundsource*

ui:
- src/**.ui
- src/dialog/**
- src/preferences/**
- src/widget/**
- changed-files:
- any-glob-to-any-file:
- src/**.ui
- src/dialog/**
- src/preferences/**
- src/widget/**

vinylcontrol:
- changed-files:
- any-glob-to-any-file:
- src/vinylcontrol/**

waveform:
- changed-files:
- any-glob-to-any-file:
- src/waveform/**
15 changes: 11 additions & 4 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@v3
uses: actions/checkout@v4
- name: Install build dependencies
run: tools/debian_buildenv.sh setup
- name: Create build directory
Expand Down Expand Up @@ -111,13 +111,20 @@ jobs:
..
working-directory: build
- name: Set up problem matcher
uses: ammaraskar/gcc-problem-matcher@master
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
working-directory: build
env:
CLAZY_CHECKS: level2,no-rule-of-two-soft,no-non-pod-global-static,no-qproperty-without-notify,no-wrong-qevent-cast,no-qstring-allocations,no-function-args-by-value,no-copyable-polymorphic,no-ctor-missing-parent-argument,no-missing-qobject-macro,no-rule-of-three,no-returning-void-expression,no-missing-typeinfo,no-base-class-event
CLAZY_CHECKS: level2,container-inside-loop,heap-allocated-small-trivial-type,isempty-vs-count,qhash-with-char-pointer-key,qproperty-type-mismatch,tr-non-literal,no-rule-of-two-soft,no-non-pod-global-static,no-qproperty-without-notify,no-qstring-allocations,no-function-args-by-value,no-copyable-polymorphic,no-ctor-missing-parent-argument,no-missing-qobject-macro,no-rule-of-three,no-returning-void-expression
CLAZY_IGNORE_DIRS: lib/.*
- name: "Test"
if: matrix.name == 'coverage'
Expand Down Expand Up @@ -146,7 +153,7 @@ jobs:
- name: "Upload Coverage Report to coveralls.io"
if: matrix.name == 'coverage'
continue-on-error: true
uses: coverallsapp/github-action@master
uses: coverallsapp/github-action@v2.2.3
with:
flag-name: ubuntu-22.04
path-to-lcov: build/lcov.info
Expand Down
Loading

0 comments on commit d81b1b3

Please sign in to comment.