diff options
author | Chris Robinson <[email protected]> | 2019-11-28 15:47:16 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2019-11-28 15:48:07 -0800 |
commit | b310e09f596b0325da774a543de086b44d98523f (patch) | |
tree | a90c2309006128d5bf7045ff4e371547c02096be | |
parent | 6069eef94daa2c033f5f785274764e3db2605f6f (diff) |
Rename the default HRTF
-rw-r--r-- | CMakeLists.txt | 6 | ||||
-rw-r--r-- | alc/hrtf.cpp | 12 | ||||
-rw-r--r-- | hrtf/Default HRTF.mhr (renamed from hrtf/default-44100.mhr) | bin | 80354 -> 80354 bytes |
3 files changed, 9 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f7f22b0..4bc0aeeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1112,7 +1112,7 @@ option(ALSOFT_EMBED_HRTF_DATA "Embed the HRTF data files (increases library foot if(ALSOFT_EMBED_HRTF_DATA) MACRO(make_hrtf_header FILENAME VARNAME) SET(infile "${OpenAL_SOURCE_DIR}/hrtf/${FILENAME}") - SET(outfile "${OpenAL_BINARY_DIR}/${FILENAME}.h") + SET(outfile "${OpenAL_BINARY_DIR}/${VARNAME}.h") ADD_CUSTOM_COMMAND(OUTPUT "${outfile}" COMMAND "${BIN2H_COMMAND}" "${infile}" "${outfile}" ${VARNAME} @@ -1122,7 +1122,7 @@ if(ALSOFT_EMBED_HRTF_DATA) SET(ALC_OBJS ${ALC_OBJS} "${outfile}") ENDMACRO() - make_hrtf_header(default-44100.mhr "hrtf_default_44100") + make_hrtf_header("Default HRTF.mhr" "hrtf_default") endif() ADD_CUSTOM_COMMAND(OUTPUT "${OpenAL_BINARY_DIR}/bsinc_inc.h" @@ -1361,7 +1361,7 @@ ENDIF() # Install HRTF definitions IF(ALSOFT_HRTF_DEFS) - INSTALL(FILES hrtf/default-44100.mhr + INSTALL(FILES "hrtf/Default HRTF.mhr" DESTINATION ${CMAKE_INSTALL_DATADIR}/openal/hrtf) MESSAGE(STATUS "Installing HRTF definitions") MESSAGE(STATUS "") diff --git a/alc/hrtf.cpp b/alc/hrtf.cpp index 041451bb..da2ac8b1 100644 --- a/alc/hrtf.cpp +++ b/alc/hrtf.cpp @@ -1172,7 +1172,7 @@ void AddBuiltInEntry(const std::string &dispname, ALuint residx) } -#define IDR_DEFAULT_44100_MHR 1 +#define IDR_DEFAULT_HRTF_MHR 1 using ResData = al::span<const char>; #ifndef ALSOFT_EMBED_HRTF_DATA @@ -1182,12 +1182,12 @@ ResData GetResource(int /*name*/) #else -#include "default-44100.mhr.h" +#include "hrtf_default.h" ResData GetResource(int name) { - if(name == IDR_DEFAULT_44100_MHR) - return {reinterpret_cast<const char*>(hrtf_default_44100), sizeof(hrtf_default_44100)}; + if(name == IDR_DEFAULT_HRTF_MHR) + return {reinterpret_cast<const char*>(hrtf_default), sizeof(hrtf_default)}; return ResData{}; } #endif @@ -1240,8 +1240,8 @@ al::vector<std::string> EnumerateHrtf(const char *devname) for(const auto &fname : SearchDataFiles(".mhr", "openal/hrtf")) AddFileEntry(fname); - if(!GetResource(IDR_DEFAULT_44100_MHR).empty()) - AddBuiltInEntry("Built-In 44100hz", IDR_DEFAULT_44100_MHR); + if(!GetResource(IDR_DEFAULT_HRTF_MHR).empty()) + AddBuiltInEntry("Built-In HRTF", IDR_DEFAULT_HRTF_MHR); } al::vector<std::string> list; diff --git a/hrtf/default-44100.mhr b/hrtf/Default HRTF.mhr Binary files differindex f7992e13..f7992e13 100644 --- a/hrtf/default-44100.mhr +++ b/hrtf/Default HRTF.mhr |