Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 128 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# Format Style Options - Created with Clang Power Tools
---
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignConsecutiveDeclarations: None
AlignConsecutiveMacros: Consecutive
AlignEscapedNewlines: DontAlign
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Never
AllowShortLambdasOnASingleLine: Inline
AllowShortEnumsOnASingleLine: true
AllowShortFunctionsOnASingleLine: Inline
AllowShortIfStatementsOnASingleLine: Never
AllowShortLoopsOnASingleLine: false
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: Yes
BasedOnStyle: LLVM
BinPackArguments: false
BinPackParameters: false
BraceWrapping:
AfterCaseLabel: false
AfterClass: true
AfterControlStatement: true
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: false
AfterStruct: true
AfterUnion: true
AfterExternBlock: true
BeforeCatch: true
BeforeElse: true
IndentBraces: false
SplitEmptyFunction: false
SplitEmptyRecord: false
SplitEmptyNamespace: false
BeforeLambdaBody: false
BeforeWhile: true
BreakBeforeBraces: Custom
BreakInheritanceList: BeforeComma
BreakBeforeTernaryOperators: true
BreakConstructorInitializers: BeforeComma
ColumnLimit: 100
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth : 2
ContinuationIndentWidth: 2
Cpp11BracedListStyle: false
DerivePointerAlignment: true
FixNamespaceComments: false
IndentCaseBlocks: false
IndentCaseLabels: false
IndentPPDirectives: BeforeHash
IndentWidth: 2
IndentWrappedFunctionNames: true
KeepEmptyLinesAtTheStartOfBlocks: true
MaxEmptyLinesToKeep: 2
NamespaceIndentation: All
PenaltyBreakAssignment: 200
PenaltyBreakBeforeFirstCallParameter: 10
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 200
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyIndentedWhitespace: 20
PenaltyReturnTypeOnItsOwnLine: 600
PointerAlignment: Left
SortIncludes: false
SortUsingDeclarations: false
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: true
SpaceAfterTemplateKeyword: true
SpaceAroundPointerQualifiers: After
SpaceBeforeAssignmentOperators: true
SpaceBeforeCpp11BracedList: true
SpaceBeforeParens: ControlStatements
SpaceBeforeSquareBrackets: false
SpaceInEmptyBlock: true
SpaceInEmptyParentheses: false
SpacesInAngles: false
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: c++17
StatementMacros:
- MAssert
- MInvalid
- MDeclareDebugNewAndDelete
- MImplementDebugNewAndDelete
- MImplementSmallObjDebugNewAndDelete
- M__DisableFloatingPointAssertions
- M__EnableFloatingPointAssertions
- MInitAllocaArray
- MInitAllocaList
- MNoFastMathPush
- MNoFastMathPop
- MTry_SystemException
- MCatch_SystemException
- MCatch_SystemExceptionAndDumpStack
- MFinalize_SystemException
- MBeginAddProperties
- MAddProperty
- MAddPropertyArray
- MAddAttribute
- MAddCommentNode
- MEndAddProperties
- MBeginCallVstFunction
- MEndCallVstFunction
- MBeginCallVst3Function
- MEndCallVst3Function
- MBeginCallAudioUnitFunction
- MEndCallAudioUnitFunction
- MBeginCallLadspaFunction
- MEndCallLadspaFunction
- MPrepareInvoke
- MEndInvoke
- MProfileTraceStart
- MProfileTrace
- MProfileTraceStop

TabWidth: 2
TypenameMacros:
['STACK_OF', 'LIST']
UseCRLF: false
UseTab: false
...
23 changes: 23 additions & 0 deletions .clangd
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Index:
Background: Build

CompileFlags:
CompilationDatabase: ./Build/Out

Diagnostics:
ClangTidy:
Add:
- modernize-*
- performance-*
Remove:
- modernize-use-trailing-return-type
- modernize-deprecated-headers
- performance-no-int-to-ptr

InlayHints:
Enabled: True
ParameterNames: True
DeducedTypes: True

Completion:
AllScopes: True
13 changes: 13 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# http://editorconfig.org
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = false

[*.md]
trim_trailing_whitespace = false
8 changes: 2 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ jobs:
}
- {
name: "Ubuntu", artifact: "Linux.tar.xz",
os: ubuntu-20.04,
os: ubuntu-22.04,
build_type: "Release", cc: "gcc", cxx: "g++",
build_script: "build.sh",
}
- {
name: "macOS", artifact: "macOS.tar.xz",
os: macos-13,
os: macos-15,
build_type: "Release", cc: "clang", cxx: "clang++",
build_script: "build.sh",
}
Expand All @@ -45,10 +45,6 @@ jobs:
sudo apt install -y cmake ninja-build libmpg123-dev
if: ${{ matrix.config.name == 'Ubuntu' }}

- name: Setup (OSX)
run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
if: ${{ matrix.config.name == 'macOS' }}

- name: Checkout
uses: actions/checkout@v2
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ cmake-build-debug
# /Build/
/Build/Out
/Build/codeql-results.sarif
/Build/.cmake

# /Source/
/Source/html
Expand Down
4 changes: 2 additions & 2 deletions 3rdParty/Aubio/Library/Mac/libAubio_.a
Git LFS file not shown
4 changes: 2 additions & 2 deletions 3rdParty/Aubio/Library/Win/x64/Aubio_d.lib
Git LFS file not shown
12 changes: 7 additions & 5 deletions 3rdParty/Aubio/Mac/Aubio.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -402,14 +402,14 @@
B97FD560075C4334B91403AA /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 0620;
};
buildConfigurationList = 8EAF8A47B8D042C5AAF0416B /* Build configuration list for PBXProject "Aubio" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = D9BF3D257A6E487D8854CA99;
Expand Down Expand Up @@ -495,6 +495,7 @@
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_OPTIMIZATION_LEVEL = s;
GCC_PREPROCESSOR_DEFINITIONS = (
"HAVE_CONFIG_H=1",
"HAVE_AUBIO_DOUBLE=1",
"NULL=0",
);
Expand Down Expand Up @@ -528,10 +529,10 @@
3FD29E83A31B4C32B864BB15 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
ARCHS = "$(ARCHS_STANDARD)";
OBJROOT = ../../../Temp;
ONLY_ACTIVE_ARCH = NO;
SDKROOT = macosx10.9;
SDKROOT = macosx13.3;
SYMROOT = ../Library;
};
name = Debug;
Expand All @@ -547,6 +548,7 @@
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"HAVE_CONFIG_H=1",
"HAVE_AUBIO_DOUBLE=1",
"NULL=0",
);
Expand Down Expand Up @@ -579,10 +581,10 @@
799D1B50A65C40369F40473B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
ARCHS = "$(ARCHS_STANDARD)";
OBJROOT = ../../../Temp;
ONLY_ACTIVE_ARCH = NO;
SDKROOT = macosx10.9;
SDKROOT = macosx13.3;
SYMROOT = ../Library;
};
name = Release;
Expand Down
6 changes: 3 additions & 3 deletions 3rdParty/Aubio/Win/Aubio.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{5AA81D15-3084-4F6A-AFDC-F71C2EDC2C29}</ProjectGuid>
<RootNamespace>Aubio</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
Expand All @@ -154,13 +154,13 @@
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down
14 changes: 6 additions & 8 deletions 3rdParty/Boost/Dist/boost/config/compiler/visualc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,11 @@
# define BOOST_COMPILER_VERSION evc9
# elif _MSC_VER < 1700
# define BOOST_COMPILER_VERSION evc10
# elif _MSC_VER < 1800
# define BOOST_COMPILER_VERSION evc11
# elif _MSC_VER < 1900
# elif _MSC_VER < 1800
# define BOOST_COMPILER_VERSION evc11
# elif _MSC_VER < 1900
# define BOOST_COMPILER_VERSION evc12
# elif _MSC_VER < 2000
# elif _MSC_VER < 2000
# define BOOST_COMPILER_VERSION evc14
# else
# if defined(BOOST_ASSERT_CONFIG)
Expand All @@ -279,7 +279,7 @@
# define BOOST_COMPILER_VERSION 9.0
# elif _MSC_VER < 1700
# define BOOST_COMPILER_VERSION 10.0
# elif _MSC_VER < 1800
# elif _MSC_VER < 1800
# define BOOST_COMPILER_VERSION 11.0
# elif _MSC_VER < 1900
# define BOOST_COMPILER_VERSION 12.0
Expand All @@ -293,9 +293,7 @@
# define BOOST_COMPILER "Microsoft Visual C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
#endif

//
// last known and checked version is 15.9.11 (VC++ 2017 RTM):
#if (_MSC_VER > 1916)
#if (_MSC_VER > 1944)
# if defined(BOOST_ASSERT_CONFIG)
# error "Unknown compiler version - please run the configure tests and report the results"
# else
Expand Down
2 changes: 1 addition & 1 deletion 3rdParty/Boost/Dist/boost/iostreams/detail/config/fpos.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#endif

# if (defined(_YVALS) || defined(_CPPLIB_VER)) && !defined(__SGI_STL_PORT) && \
!defined(_STLPORT_VERSION) && !defined(__QNX__)
!defined(_STLPORT_VERSION) && !defined(__QNX__) && !defined(_MSC_VER)
/**/
# define BOOST_IOSTREAMS_HAS_DINKUMWARE_FPOS
# endif
Expand Down
5 changes: 2 additions & 3 deletions 3rdParty/Boost/Export/BoostProgramOptions.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

// create a TString compatible boost command line parser instance

static inline boost::program_options::command_line_parser
static inline boost::program_options::command_line_parser
CreateBoostCommandLineParser(const TList<TString>& Arguments)
{
// convert TStrings to UTF8
Expand Down Expand Up @@ -67,7 +67,7 @@ static inline TList<TString> ArgumentToStringList(
// convert UTF8 to TStrings
TList<TString> Ret;
Ret.PreallocateSpace((int)CStrings.size());
for (const std::string CString : CStrings)
for (const std::string& CString : CStrings)
{
Ret.Append(TString(CString.c_str(), TString::kUtf8));
}
Expand All @@ -77,4 +77,3 @@ static inline TList<TString> ArgumentToStringList(


#endif // _BoostProgramOptions_h_

4 changes: 2 additions & 2 deletions 3rdParty/Boost/Library/Mac/libBoostProgramOptions_.a
Git LFS file not shown
4 changes: 2 additions & 2 deletions 3rdParty/Boost/Library/Mac/libBoostSerialization_.a
Git LFS file not shown
4 changes: 2 additions & 2 deletions 3rdParty/Boost/Library/Mac/libBoostSystem_.a
Git LFS file not shown
4 changes: 2 additions & 2 deletions 3rdParty/Boost/Library/Mac/libBoostUnitTest_.a
Git LFS file not shown
4 changes: 2 additions & 2 deletions 3rdParty/Boost/Library/Win/x64/BoostProgramOptions_d.lib
Git LFS file not shown
Loading