Merge branch 'master' into feature/anti_alias_mode

utokusa · Jul 11, 2022 · 3c7601c · 3c7601c
2 parents d7f58b5 + 5fc618d
commit 3c7601c
Show file tree

Hide file tree

Showing 61 changed files with 1,981 additions and 307 deletions.
diff --git a/.github/workflows/test_and_release.yaml b/.github/workflows/test_and_release.yaml
@@ -148,6 +148,7 @@ jobs:
             -D CMAKE_MAKE_PROGRAM=ninja
             -D CMAKE_C_COMPILER_LAUNCHER=ccache
             -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
+            -D "CMAKE_OSX_ARCHITECTURES=x86_64;arm64"
           RESULT_VARIABLE result
         )
         if (NOT result EQUAL 0)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,10 +1,13 @@
 cmake_minimum_required(VERSION 3.20)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum OS X deployment target")
-set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Build as universal binary")
+
+# It cause fe_expected_compiler_job locally.
+# So create universal binaries only on CI/CD. 
+# set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Build as universal binary")
 
 PROJECT(OS_251
         LANGUAGES CXX C
-        VERSION 1.1.1
+        VERSION 1.2.0
         )
 
 add_compile_definitions(OS_251_PROJECT_VERSION="${PROJECT_VERSION}")

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 CONFIG?=Debug
-BUILD_DIR?=cmake-build
+BUILD_DIR?=build
 GENERATOR_OPTION?=-G "Ninja"
 
 # For Release build, set environment variable CONFIG.
@@ -12,6 +12,7 @@ ifeq ($(OS), Windows_NT)
 	STANDALONE_BIN_PATH=.\${BUILD_DIR}\src\Os251_artefacts\${CONFIG}\Standalone\OS-251.exe
 	TESTS_BIN_PATH:=.\${BUILD_DIR}\tests\${CONFIG}\Os251_Tests.exe
 	TESTS_USING_JUCE_BIN_PATH:=.\${BUILD_DIR}\tests/Os251_TestsUsingJuce_artefacts\${CONFIG}\Os251_TestsUsingJuce.exe
+	BENCHMARK_BIN_PATH:=.\${BUILD_DIR}\benchmark\Os251_Benchmark_artefacts\${CONFIG}\Os251_Benchmark.exe
 	RM_COMMAND=rmdir /s /q ${BUILD_DIR}
 	# Use default just because I don't know how to use Ninja in Windows 
 	GENERATOR_OPTION=
@@ -28,6 +29,7 @@ else
 	endif
 	TESTS_BIN_PATH:=./${BUILD_DIR}/tests/Os251_Tests
 	TESTS_USING_JUCE_BIN_PATH:=./${BUILD_DIR}/tests/Os251_TestsUsingJuce_artefacts/${CONFIG}/Os251_TestsUsingJuce
+	BENCHMARK_BIN_PATH:=./${BUILD_DIR}/benchmark/Os251_Benchmark_artefacts/${CONFIG}/Os251_Benchmark
 	RM_COMMAND=rm -rf ${BUILD_DIR}
 endif
 
@@ -79,6 +81,40 @@ test-all: test test-juce
 	make test
 	make test-juce
 
+#
+# Benchmark
+#
+
+build-benchmark:
+	cmake --build $(BUILD_DIR) --config $(CONFIG) --target Os251_Benchmark
+
+.PHONY: benchmark
+benchmark: build-benchmark
+	${BENCHMARK_BIN_PATH}
+
+#
+# Lint
+#
+
+.PHONY: lint
+lint:
+	./lint.sh
+
+.PHONY: lint-fix
+lint-fix:
+	./lint.sh fix
+
+#
+# All check
+#
+.PHONY: check-all
+check-all:
+	make lint
+	make build-all
+	make test
+	make test-juce
+	make benchmark
+
 #
 # Clean up
 #

diff --git a/assets/presets/Default.oapreset b/assets/presets/Default.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="1.0"/>
       <PARAM id="sustain" value="1.0"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/Bass/Bass0.oapreset b/assets/presets/Factory/Bass/Bass0.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="1.0"/>
       <PARAM id="sustain" value="0.2300000190734863"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/Bass/Bass1.oapreset b/assets/presets/Factory/Bass/Bass1.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="0.0"/>
       <PARAM id="sustain" value="0.1050000414252281"/>
       <PARAM id="syncOn" value="1.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/Bass/Bass2.oapreset b/assets/presets/Factory/Bass/Bass2.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="1.0"/>
       <PARAM id="sustain" value="0.324999988079071"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/Bass/Bass3.oapreset b/assets/presets/Factory/Bass/Bass3.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="1.0"/>
       <PARAM id="sustain" value="0.0"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/FX/FX0.oapreset b/assets/presets/Factory/FX/FX0.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="1.0"/>
       <PARAM id="sustain" value="0.0"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/FX/FX1.oapreset b/assets/presets/Factory/FX/FX1.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="1.0"/>
       <PARAM id="sustain" value="0.0"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/FX/FX2.oapreset b/assets/presets/Factory/FX/FX2.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="1.0"/>
       <PARAM id="sustain" value="0.0"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/FX/FX3.oapreset b/assets/presets/Factory/FX/FX3.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="0.0"/>
       <PARAM id="sustain" value="0.0"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/Key/Key0.oapreset b/assets/presets/Factory/Key/Key0.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="0.0"/>
       <PARAM id="sustain" value="0.2900000214576721"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/Key/Key1.oapreset b/assets/presets/Factory/Key/Key1.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="0.0"/>
       <PARAM id="sustain" value="0.5049999952316284"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/Key/Key2.oapreset b/assets/presets/Factory/Key/Key2.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="1.0"/>
       <PARAM id="sustain" value="0.0"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/Key/Key3.oapreset b/assets/presets/Factory/Key/Key3.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="0.7450000047683716"/>
       <PARAM id="sustain" value="1.0"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/Pad/Pad0.oapreset b/assets/presets/Factory/Pad/Pad0.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="1.0"/>
       <PARAM id="sustain" value="1.0"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/Pad/Pad1.oapreset b/assets/presets/Factory/Pad/Pad1.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="1.0"/>
       <PARAM id="sustain" value="1.0"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/Pad/Pad2.oapreset b/assets/presets/Factory/Pad/Pad2.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="0.7950000166893005"/>
       <PARAM id="sustain" value="1.0"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>
diff --git a/assets/presets/Factory/Pad/Pad3.oapreset b/assets/presets/Factory/Pad/Pad3.oapreset
@@ -2,7 +2,7 @@
 
 <Preset>
   <Gadget>OS-251</Gadget>
-  <SavedByVersion>1.1.0</SavedByVersion>
+  <SavedByVersion>1.2.0</SavedByVersion>
   <Version>0</Version>
   <State>
     <OS-251>
@@ -37,6 +37,7 @@
       <PARAM id="subSquareGain" value="0.7850000262260437"/>
       <PARAM id="sustain" value="1.0"/>
       <PARAM id="syncOn" value="0.0"/>
+      <PARAM id="unisonOn" value="0.0"/>
     </OS-251>
   </State>
 </Preset>