[2.0.3] Update for JUCE 7.0.7.

.clang-format

@@ -0,0 +1,212 @@
+---
+# BasedOnStyle:  Google
+AccessModifierOffset: -1
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: None
+AlignConsecutiveMacros: None
+AlignConsecutiveAssignments: None
+AlignConsecutiveBitFields: None
+AlignConsecutiveDeclarations: None
+AlignEscapedNewlines: Left
+AlignOperands: Align
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortEnumsOnASingleLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: Yes
+AttributeMacros:
+  - __capability
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: false
+  AfterControlStatement: Never
+  AfterEnum: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterObjCDeclaration: false
+  AfterStruct: false
+  AfterUnion: false
+  AfterExternBlock: false
+  BeforeCatch: false
+  BeforeElse: false
+  BeforeLambdaBody: false
+  BeforeWhile: false
+  IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: true
+BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit: 80
+CommentPragmas: "^ IWYU pragma:"
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: true
+DerivePointerAlignment: true
+DisableFormat: false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex: '^<ext/.*\.h>'
+    Priority: 2
+    SortPriority: 0
+    CaseSensitive: false
+  - Regex: '^<.*\.h>'
+    Priority: 1
+    SortPriority: 0
+    CaseSensitive: false
+  - Regex: "^<.*"
+    Priority: 2
+    SortPriority: 0
+    CaseSensitive: false
+  - Regex: ".*"
+    Priority: 3
+    SortPriority: 0
+    CaseSensitive: false
+IncludeIsMainRegex: "([-_](test|unittest))?$"
+IncludeIsMainSourceRegex: ""
+IndentAccessModifiers: false
+IndentCaseLabels: true
+IndentCaseBlocks: false
+IndentGotoLabels: true
+IndentPPDirectives: None
+IndentExternBlock: AfterExternBlock
+IndentRequires: false
+IndentWidth: 2
+IndentWrappedFunctionNames: false
+InsertTrailingCommas: None
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: Signature
+MacroBlockBegin: ""
+MacroBlockEnd: ""
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Never
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PenaltyIndentedWhitespace: 0
+PointerAlignment: Left
+PPIndentWidth: -1
+RawStringFormats:
+  - Language: Cpp
+    Delimiters:
+      - cc
+      - CC
+      - cpp
+      - Cpp
+      - CPP
+      - "c++"
+      - "C++"
+      - "cs"
+    CanonicalDelimiter: ""
+    BasedOnStyle: google
+  - Language: TextProto
+    Delimiters:
+      - pb
+      - PB
+      - proto
+      - PROTO
+    EnclosingFunctions:
+      - EqualsProto
+      - EquivToProto
+      - PARSE_PARTIAL_TEXT_PROTO
+      - PARSE_TEST_PROTO
+      - PARSE_TEXT_PROTO
+      - ParseTextOrDie
+      - ParseTextProtoOrDie
+      - ParseTestProto
+      - ParsePartialTestProto
+    CanonicalDelimiter: pb
+    BasedOnStyle: google
+ReferenceAlignment: Pointer
+ReflowComments: true
+ShortNamespaceLines: 1
+SortIncludes: CaseSensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles: Never
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: -1
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+BitFieldColonSpacing: Both
+Standard: Auto
+StatementAttributeLikeMacros:
+  - Q_EMIT
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth: 8
+UseCRLF: false
+UseTab: Never
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
+  - NS_SWIFT_NAME
+  - CF_SWIFT_NAME
+---
+

README.md

@@ -2,9 +2,9 @@
 
 This is a fork of the [original SFZero by Steve Folta](https://github.com/stevefolta/SFZero), with the following changes:
 
-* has been converted to a Juce module, so you can easily consume it from your own projects (you still get the sample player plugin, but it now includes that module)
-* requires Juce 4.1 or higher
-* supports Juce 4.1 module format
+* has been converted to a Juce USER module, so you can easily consume it from your own projects (you still get the sample player plugin, but it now includes that module)
+* requires Juce 7 or higher
+* supports Juce 7 module format
 * now also supports new Juce 4.2 module format (thanks to Loki Davison)
 * conveniently sits within its own `sfzero::` namespace
 * has a tidied-up code base, so it now builds with as few warnings as possible on all platforms and on both 32/64 bit architectures. I also simplified logging, added support for synchronous sample loading, and fixed a few bugs.

SFZero.cpp

@@ -1,18 +1,19 @@
-// Your project must contain an AppConfig.h file with your project-specific settings in it,
-// and your header search path must make it accessible to the module's files.
+// Your project must contain an AppConfig.h file with your project-specific
+// settings in it, and your header search path must make it accessible to the
+// module's files.
 
-//#include "AppConfig.h"
 #include "SFZero.h"
-#include "sfzero/RIFF.cpp" 
-#include "sfzero/SF2.cpp" 
-#include "sfzero/SF2Generator.cpp" 
-#include "sfzero/SF2Reader.cpp" 
-#include "sfzero/SF2Sound.cpp" 
-#include "sfzero/SFZDebug.cpp" 
-#include "sfzero/SFZEG.cpp" 
-#include "sfzero/SFZReader.cpp" 
-#include "sfzero/SFZRegion.cpp" 
-#include "sfzero/SFZSample.cpp" 
-#include "sfzero/SFZSound.cpp" 
-#include "sfzero/SFZSynth.cpp" 
-#include "sfzero/SFZVoice.cpp" 
+
+#include "sfzero/RIFF.cpp"
+#include "sfzero/SF2.cpp"
+#include "sfzero/SF2Generator.cpp"
+#include "sfzero/SF2Reader.cpp"
+#include "sfzero/SF2Sound.cpp"
+#include "sfzero/SFZDebug.cpp"
+#include "sfzero/SFZEG.cpp"
+#include "sfzero/SFZReader.cpp"
+#include "sfzero/SFZRegion.cpp"
+#include "sfzero/SFZSample.cpp"
+#include "sfzero/SFZSound.cpp"
+#include "sfzero/SFZSynth.cpp"
+#include "sfzero/SFZVoice.cpp"

SFZero.h

@@ -1,16 +1,29 @@
-/*
-BEGIN_JUCE_MODULE_DECLARATION
-    ID:               SFZero
-    vendor:           altalogix
-    version:          2.0.2
-    name:             SFZero sfz player
-    description:      SFZero .szf/.sf2 soundfont player; forked from https://github.com/stevefolta/SFZero and converted to Juce module by Leo Olivers
-    website:          https://github.com/altalogix/SFZero
-    dependencies:     juce_gui_basics, juce_audio_basics, juce_audio_processors
-	license:          MIT
-END_JUCE_MODULE_DECLARATION 
-*/
+/*******************************************************************************
+ The block below describes the properties of this module, and is read by
+ the Projucer to automatically generate project code that uses it.
+ For details about the syntax and how to create or use a module, see the
+ JUCE Module Format.md file.
 
+
+ BEGIN_JUCE_MODULE_DECLARATION
+
+  ID:                 SFZero
+  vendor:             altalogix
+  version:            2.0.3
+  name:               SFZero sfz player
+  description:        SFZero .szf/.sf2 soundfont player; forked from
+https://github.com/stevefolta/SFZero and converted to Juce module by Leo Olivers
+  website:            https://github.com/altalogix/SFZeroModule
+  license:            MIT
+  minimumCppStandard: 17
+
+  dependencies:       juce_gui_basics, juce_audio_basics, juce_audio_processors
+
+ END_JUCE_MODULE_DECLARATION
+
+*******************************************************************************/
+
+#pragma once
 #ifndef INCLUDED_SFZERO_H
 #define INCLUDED_SFZERO_H
 
@@ -30,6 +43,4 @@ END_JUCE_MODULE_DECLARATION
 #include "sfzero/SFZSynth.h"
 #include "sfzero/SFZVoice.h"
 
-
-#endif   // INCLUDED_SFZERO_H
-
+#endif  // INCLUDED_SFZERO_H

SFZero.mm

@@ -0,0 +1,26 @@
+/*
+  ==============================================================================
+
+   This file is part of the JUCE library.
+   Copyright (c) 2022 - Raw Material Software Limited
+
+   JUCE is an open source library subject to commercial or open-source
+   licensing.
+
+   By using JUCE, you agree to the terms of both the JUCE 7 End-User License
+   Agreement and JUCE Privacy Policy.
+
+   End User License Agreement: www.juce.com/juce-7-licence
+   Privacy Policy: www.juce.com/juce-privacy-policy
+
+   Or: You may also use this code under the terms of the GPL v3 (see
+   www.gnu.org/licenses).
+
+   JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
+   EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
+   DISCLAIMED.
+
+  ==============================================================================
+*/
+
+#include "SFZero.cpp"

format.sh

@@ -0,0 +1,8 @@
+find . -regex '.*\.\(hh\)' -exec clang-format -style=file -i {} \;
+find . -regex '.*\.\(cc\)' -exec clang-format -style=file -i {} \;
+find . -regex '.*\.\(mm\)' -exec clang-format -style=file -i {} \;
+find . -regex '.*\.\(h\)' -exec clang-format -style=file -i {} \;
+find . -regex '.*\.\(c\)' -exec clang-format -style=file -i {} \;
+find . -regex '.*\.\(m\)' -exec clang-format -style=file -i {} \;
+find . -regex '.*\.\(hpp\)' -exec clang-format -style=file -i {} \;
+find . -regex '.*\.\(cpp\)' -exec clang-format -style=file -i {} \;