Skip to content

Commit

Permalink
Merge branch 'mixxxdj:main' into Traktor-Z2-2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
JoergAtGithub authored Jan 12, 2025
2 parents 91887c9 + 1803e02 commit a44faf8
Show file tree
Hide file tree
Showing 1,986 changed files with 500,499 additions and 1,059,523 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
1 change: 0 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Checks: >-
readability-qualified-auto
WarningsAsErrors: ""
HeaderFilterRegex: ""
AnalyzeTemporaryDtors: false
FormatStyle: none
User: user
CheckOptions:
Expand Down
1 change: 1 addition & 0 deletions .cmakelintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
filter=-linelength,-convention/filename,-package/stdargs
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
24 changes: 13 additions & 11 deletions .codespellignorelines
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +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 EngineFilter::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 @@ -72,3 +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 size_t bufferSize)
// Note(RRyan/Max Linke):
// https://github.com/codders/libshout/blob/a17fb84671d3732317b0353d7281cc47e2df6cf6/src/timing/timing.c
4 changes: 0 additions & 4 deletions .eslintignore

This file was deleted.

135 changes: 0 additions & 135 deletions .eslintrc.json

This file was deleted.

1 change: 1 addition & 0 deletions .gersemirc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
indent: 2
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ updates:
directory: "/"
schedule:
interval: "weekly"
target-branch: "2.5"
156 changes: 137 additions & 19 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,147 @@
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

controller backend:
- changed-files:
- any-glob-to-any-file:
- src/controllers/**

controller mappings:
- 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/**

controllers:
- res/controllers/**
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/**

qml:
- changed-files:
- any-glob-to-any-file:
- res/qml/**
- src/qml/**

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/**
Loading

0 comments on commit a44faf8

Please sign in to comment.