Switch to bear's nohlmann json branch

ebu · Dec 5, 2024 · b8c6915 · b8c6915
1 parent 012b011
commit b8c6915
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/submodules/bear b/submodules/bear
diff --git a/vcpkg.json b/vcpkg.json
@@ -3,6 +3,7 @@
   "name": "ear-production-suite",
   "version": "1.1.0",
   "dependencies": [
+    "nlohmann-json",
     "protobuf",
     "nng",
     "spdlog",
+0 −3		.gitmodules
+4 −4		bear/data_file.py
+21 −20		flake.lock
+2 −1		nix/bear.nix
+5 −2		nix/ear.nix
+14 −1		nix/visr.nix
+3 −4		nix/visr_bear.nix
+1 −0		setup.py
+1 −12		visr_bear/CMakeLists.txt
+5 −3		visr_bear/pythonwrappers/CMakeLists.txt
+1 −1		visr_bear/pythonwrappers/internals.cpp
+1 −1		visr_bear/src/CMakeLists.txt
+26 −21		visr_bear/src/api.cpp
+1 −1		visr_bear/src/brir_interpolation_controller.cpp
+4 −4		visr_bear/src/data_file.cpp
+6 −6		visr_bear/src/dsp.cpp
+3 −3		visr_bear/src/dsp.hpp
+4 −2		visr_bear/src/dynamic_renderer.cpp
+1 −1		visr_bear/src/gain_calc_objects.cpp
+40 −35		visr_bear/src/panner.cpp
+1 −1		visr_bear/src/panner.hpp
+3 −6		visr_bear/src/parameters.hpp
+1 −2		visr_bear/src/select_brir.cpp
+1 −1		visr_bear/src/sh_rotation.cpp
+1 −1		visr_bear/src/static_delay_calc.cpp
+13 −16		visr_bear/src/tensorfile.cpp
+6 −6		visr_bear/src/tensorfile.hpp
+0 −6		visr_bear/submodules/CMakeLists.txt
+0 −1		visr_bear/submodules/rapidjson
+21 −34		visr_bear/test/benchmark.cpp
+1 −1		visr_bear/test/test_sh_rotation.cpp
+1 −1		visr_bear/test/test_tensorfile.cpp