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
@@ -17,24 +17,14 @@
|
||||
|
||||
namespace joc_settings {
|
||||
|
||||
// Which HRTF the binaural renderer uses. Only these two inputs exist: everything
|
||||
// else (compiling a SOFA into the renderer's field, caching it) is internal.
|
||||
enum class HrtfSource {
|
||||
kSofa = 0, // SOFA SimpleFreeFieldHRIR, compiled by the renderer
|
||||
kRosella = 1, // Rosella .personalized_headphone model
|
||||
};
|
||||
|
||||
const char* hrtf_source_name(HrtfSource source);
|
||||
const char* hrtf_source_extension(HrtfSource source);
|
||||
// The file looked up in the default folder (next to the component) when no path
|
||||
// is configured; same names the reference CLI uses.
|
||||
const char* hrtf_default_file_name(HrtfSource source);
|
||||
// is configured; same name the reference CLI uses.
|
||||
const char* hrtf_default_file_name();
|
||||
|
||||
// The stored values, exactly as the preferences page shows them.
|
||||
struct Values {
|
||||
int output = 0; // 0 = binaural, 1 = speaker layout
|
||||
std::string speaker_layout = "7.1";
|
||||
HrtfSource hrtf_source = HrtfSource::kSofa;
|
||||
// Empty means "the default file in the default folder".
|
||||
std::string hrtf_file;
|
||||
unsigned binaural_mode = 3; // JOC_BINAURAL_NEAR/FAR/MID = 1/2/3
|
||||
|
||||
Reference in new issue
Block a user