Sync the kernel copy and drop the SOFA source choice
The kernel copy follows the new kernel: the SOFA reader, its compile cache and the field fit are gone, the compiled-field renderer is jochrtf_renderer.cpp with jochrtf_runtime.*, and joc_kernel.vcxproj lists the new translation units. With the Rosella model as the only user-facing input, the preferences page loses its SOFA radio and the settings drop HrtfSource, hrtf_source, hrtf_cache_policy, hrtf_cache_dir and hrtf_radius_m. Decoding always sets personalized_headphone_path, the default lookup is HRTF\binaural.personalized_headphone, and the page hint names that file alone. The compiled .jochrtf stays internal: the page names a model file, never a cache. Builds Release-Static|x64 (foo_input_joc.dll and joc_kernel.lib).
This commit is contained in:
1 parent
b566c364df
commit
5d6c6bc45c
25 files changed
+144
-2896
No files matched your search
+2
-12
@@ -455,9 +455,7 @@ std::string resolve_hrtf_file(const Settings& settings) {
|
||||
if (directory.empty()) return {};
|
||||
// Same convention as the reference CLI next to its executable:
|
||||
// <base>\HRTF\binaural.sofa or <base>\HRTF\binaural.personalized_headphone.
|
||||
const char* name = (settings.hrtf_source == HrtfSource::kRosella)
|
||||
? "binaural.personalized_headphone"
|
||||
: "binaural.sofa";
|
||||
const char* name = "binaural.personalized_headphone";
|
||||
return directory + "\\HRTF\\" + name;
|
||||
}
|
||||
|
||||
@@ -1012,16 +1010,8 @@ bool Engine::start(const std::string& input_path, const Settings& settings, std:
|
||||
}
|
||||
return false;
|
||||
}
|
||||
if (settings.hrtf_source == HrtfSource::kRosella) {
|
||||
config.personalized_headphone_path = hrtf_file.c_str();
|
||||
} else {
|
||||
config.hrtf_sofa_path = hrtf_file.c_str();
|
||||
}
|
||||
config.personalized_headphone_path = hrtf_file.c_str();
|
||||
}
|
||||
config.hrtf_cache_policy = settings.hrtf_cache_policy;
|
||||
config.hrtf_cache_dir =
|
||||
settings.hrtf_cache_dir.empty() ? nullptr : settings.hrtf_cache_dir.c_str();
|
||||
config.hrtf_radius_m = settings.hrtf_radius_m;
|
||||
config.binaural_tail_seconds = settings.tail_seconds;
|
||||
config.object_delay_samples = settings.object_delay_samples;
|
||||
config.gain_db = settings.gain_db;
|
||||
|
||||
Reference in new issue
Block a user