[release] 1.0.7

.clang-format

@@ -1,121 +1,121 @@
----
-Language:        Cpp
-# BasedOnStyle:  LLVM
-AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: true
-AlignEscapedNewlines: Right
-AlignOperands:   true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: true
-AllowShortCaseLabelsOnASingleLine: true
-AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: true
-AllowShortLoopsOnASingleLine: true
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: true
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:
-  AfterClass:      true
-  AfterControlStatement: true
-  AfterEnum:       false
-  AfterFunction:   true
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     true
-  AfterUnion:      true
-  AfterExternBlock: false
-  BeforeCatch:     false
-  BeforeElse:      true
-  IndentBraces:    false
-  SplitEmptyFunction: false
-  SplitEmptyRecord: false
-  SplitEmptyNamespace: false
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Custom
-BreakBeforeInheritanceComma: false
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeColon
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: true
-ColumnLimit:     80
-CommentPragmas:  '^ IWYU pragma:'
-CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-DisableFormat:   false
-ExperimentalAutoDetectBinPacking: false
-FixNamespaceComments: true
-ForEachMacros:
-  - foreach
-  - Q_FOREACH
-  - BOOST_FOREACH
-IncludeBlocks:   Merge
-# Try and group includes by 'locality'
-# We use "" with rel paths for headers in same repo
-# Headers in quotes wiht no relative path at top
-# Group ../ and ../../ with different priorities, so they get sorted separately
-# <> headers *with a folder break* likely not to be STL -> STL / systems headers last
-IncludeCategories:
-  - Regex:           '<.+/'
-    Priority:        4
-  - Regex:           '"../../'
-    Priority:        3
-  - Regex:           '../' #
-    Priority:        2
-  - Regex:           '".+hpp"'
-    Priority:        1
-IncludeIsMainRegex: '(Test)?$'
-IndentCaseLabels: false
-IndentPPDirectives: None
-IndentWidth:     2
-IndentWrappedFunctionNames: false
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: true
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 2
-NamespaceIndentation: None
-ObjCBinPackProtocolList: Auto
-ObjCBlockIndentWidth: 2
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Left
-ReflowComments:  true
-SortIncludes:    true
-SortUsingDeclarations: true
-SpaceAfterCStyleCast: true
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard:        Cpp11
-TabWidth:        8
-UseTab:          Never
-...
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: true
+AlignEscapedNewlines: Right
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterClass:      true
+  AfterControlStatement: true
+  AfterEnum:       false
+  AfterFunction:   true
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     true
+  AfterUnion:      true
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      true
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     80
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Merge
+# Try and group includes by 'locality'
+# We use "" with rel paths for headers in same repo
+# Headers in quotes wiht no relative path at top
+# Group ../ and ../../ with different priorities, so they get sorted separately
+# <> headers *with a folder break* likely not to be STL -> STL / systems headers last
+IncludeCategories:
+  - Regex:           '<.+/'
+    Priority:        4
+  - Regex:           '"../../'
+    Priority:        3
+  - Regex:           '../' #
+    Priority:        2
+  - Regex:           '".+hpp"'
+    Priority:        1
+IncludeIsMainRegex: '(Test)?$'
+IndentCaseLabels: false
+IndentPPDirectives: None
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Left
+ReflowComments:  true
+SortIncludes:    true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: true
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          Never
+...

.gitattributes

@@ -1 +1,20 @@
+* text=auto
+
+*.clang-format text
+*.cmake text
+*.cpp text
+*.gitattributes text
+*.gitignore text
+*.hpp text
+*.in text
+*.json text
+*.lic text
+*.md text
+*.pd text
+*.py text
+*.svg text
+*.txt text
+*.yml text
+
+*.png binary
 *.wav binary

.gitignore

@@ -6,3 +6,4 @@
 FluidVersion.cpp
 flucoma.version.rc
 .vscode
+examples/build

CMakeLists.txt

@@ -1,5 +1,5 @@
 # Part of the Fluid Corpus Manipulation Project (http://www.flucoma.org/)
-# Copyright 2017-2019 University of Huddersfield.
+# Copyright University of Huddersfield.
 # Licensed under the BSD-3 License.
 # See license.md file in the project root for full license information.
 # This project has received funding from the European Research Council (ERC)
@@ -56,7 +56,7 @@ FetchContent_Declare(
   HISSTools
   GIT_REPOSITORY https://github.com/AlexHarker/HISSTools_Library
   GIT_PROGRESS TRUE
-  GIT_TAG 559b5c8
+  GIT_TAG f3292ad 
 )
 
 FetchContent_Declare(
@@ -96,6 +96,7 @@ FetchContent_Declare(
   GIT_TAG main
 )
 
+set(FMT_INSTALL OFF CACHE BOOL "")
 FetchContent_Declare(
   fmt
   GIT_SHALLOW TRUE  
@@ -167,21 +168,6 @@ if(NOT fmt_POPULATED)
 endif()
 add_subdirectory(${fmt_SOURCE_DIR} ${fmt_BINARY_DIR} EXCLUDE_FROM_ALL)
 
-# HISSTools FFT target
-add_library(
-  HISSTools_FFT STATIC "${hisstools_SOURCE_DIR}/HISSTools_FFT/HISSTools_FFT.cpp"
-)
-
-target_link_libraries(
-  HISSTools_FFT PRIVATE ${ACCELERATE}
-)
-
-target_include_directories(HISSTools_FFT PUBLIC "${hisstools_SOURCE_DIR}")
-
-set_target_properties(HISSTools_FFT PROPERTIES
-    POSITION_INDEPENDENT_CODE ON
-)
-
 # Brute force staic runtime on windwos
 if(MSVC)
   foreach(flag_var
@@ -193,13 +179,6 @@ if(MSVC)
   endforeach()
 endif()
 
-#HISSTools Audiofile Target
-add_library(
-  HISSTools_AudioFile STATIC
-  "${hisstools_SOURCE_DIR}/AudioFile/BaseAudioFile.cpp"
-  "${hisstools_SOURCE_DIR}/AudioFile/IAudioFile.cpp"
-  "${hisstools_SOURCE_DIR}/AudioFile/OAudioFile.cpp"
-)
 
 #Fluid Decomposition header-only target
 add_library(FLUID_DECOMPOSITION INTERFACE)
@@ -211,13 +190,12 @@ target_include_directories(
   FLUID_DECOMPOSITION SYSTEM INTERFACE #we don't want warnings from Eigen or HissTools
   "${eigen_SOURCE_DIR}"
   "${spectra_SOURCE_DIR}/include"
-  "${hisstools_SOURCE_DIR}"
+  "${hisstools_SOURCE_DIR}/include"
   "${memory_SOURCE_DIR}/include/foonathan"
   "${fmt_SOURCE_DIR}/include"
 )
 target_link_libraries(
   FLUID_DECOMPOSITION INTERFACE 
-  HISSTools_FFT 
   flucoma_VERSION_LIB 
   tl::optional
   nlohmann_json::nlohmann_json
@@ -243,16 +221,12 @@ target_compile_definitions(FLUID_DECOMPOSITION INTERFACE EIGEN_MPL2_ONLY=1)
 
 if(APPLE)
   #targeting <= 10.9, need to really emphasise that we want libc++ both to compiler and linker
-  target_compile_options(HISSTools_FFT PUBLIC -stdlib=libc++)
-  target_compile_options(HISSTools_AudioFile PUBLIC -stdlib=libc++)
   target_compile_options(FLUID_DECOMPOSITION INTERFACE -stdlib=libc++)
-  target_link_libraries(FLUID_DECOMPOSITION INTERFACE -stdlib=libc++)
+  target_link_libraries(FLUID_DECOMPOSITION INTERFACE -stdlib=libc++ ${ACCELERATE})
 endif()
 
 #Apply any vector instruction flags
 if(DEFINED FLUID_ARCH)
-  target_compile_options(HISSTools_FFT PUBLIC ${FLUID_ARCH})
-  target_compile_options(HISSTools_AudioFile PUBLIC ${FLUID_ARCH})
   target_compile_options(FLUID_DECOMPOSITION INTERFACE ${FLUID_ARCH})
 endif()
 

FlucomaClients.cmake

@@ -1,5 +1,5 @@
 # Part of the Fluid Corpus Manipulation Project (http://www.flucoma.org/)
-# Copyright 2017-2019 University of Huddersfield.
+# Copyright University of Huddersfield.
 # Licensed under the BSD-3 License.
 # See license.md file in the project root for full license information.
 # This project has received funding from the European Research Council (ERC)

FlucomaVersion.cmake

@@ -1,5 +1,5 @@
 # Part of the Fluid Corpus Manipulation Project (http://www.flucoma.org/)
-# Copyright 2017-2019 University of Huddersfield.
+# Copyright University of Huddersfield.
 # Licensed under the BSD-3 License.
 # See license.md file in the project root for full license information.
 # This project has received funding from the European Research Council (ERC)
@@ -14,15 +14,15 @@ find_package(Git REQUIRED)
 
 set(flucoma_VERSION_MAJOR 1)
 set(flucoma_VERSION_MINOR 0)
-set(flucoma_VERSION_PATCH 6)
+set(flucoma_VERSION_PATCH 7)
 set(flucoma_VERSION_SUFFIX "")
 
 function(make_flucoma_version_string output_variable)
   set(result "${flucoma_VERSION_MAJOR}.${flucoma_VERSION_MINOR}.${flucoma_VERSION_PATCH}") 
-  if(${flucoma_VERSION_SUFFIX})
+  if(flucoma_VERSION_SUFFIX)
     string(APPEND result "-${flucoma_VERSION_SUFFIX}")
   endif()  
-  set(${output_variable} ${result} PARENT_SCOPE)    
+  set(${output_variable} ${result} PARENT_SCOPE)
 endfunction()
 
 function(make_flucoma_version_string_with_sha output_variable)