Don't keep a resampled default HRTF

This commit is contained in:
Chris Robinson
2019-11-28 12:57:42 -08:00
parent f6105cbff0
commit 4eb9a0b835
3 changed files with 1 additions and 9 deletions
+1 -2
View File
@@ -1123,7 +1123,6 @@ if(ALSOFT_EMBED_HRTF_DATA)
ENDMACRO()
make_hrtf_header(default-44100.mhr "hrtf_default_44100")
make_hrtf_header(default-48000.mhr "hrtf_default_48000")
endif()
ADD_CUSTOM_COMMAND(OUTPUT "${OpenAL_BINARY_DIR}/bsinc_inc.h"
@@ -1362,7 +1361,7 @@ ENDIF()
# Install HRTF definitions
IF(ALSOFT_HRTF_DEFS)
INSTALL(FILES hrtf/default-44100.mhr hrtf/default-48000.mhr
INSTALL(FILES hrtf/default-44100.mhr
DESTINATION ${CMAKE_INSTALL_DATADIR}/openal/hrtf)
MESSAGE(STATUS "Installing HRTF definitions")
MESSAGE(STATUS "")
-7
View File
@@ -1176,7 +1176,6 @@ void AddBuiltInEntry(const std::string &dispname, ALuint residx)
#define IDR_DEFAULT_44100_MHR 1
#define IDR_DEFAULT_48000_MHR 2
using ResData = al::span<const char>;
#ifndef ALSOFT_EMBED_HRTF_DATA
@@ -1187,14 +1186,11 @@ ResData GetResource(int /*name*/)
#else
#include "default-44100.mhr.h"
#include "default-48000.mhr.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_48000_MHR)
return {reinterpret_cast<const char*>(hrtf_default_48000), sizeof(hrtf_default_48000)};
return ResData{};
}
#endif
@@ -1249,9 +1245,6 @@ al::vector<std::string> EnumerateHrtf(const char *devname)
if(!GetResource(IDR_DEFAULT_44100_MHR).empty())
AddBuiltInEntry("Built-In 44100hz", IDR_DEFAULT_44100_MHR);
if(!GetResource(IDR_DEFAULT_48000_MHR).empty())
AddBuiltInEntry("Built-In 48000hz", IDR_DEFAULT_48000_MHR);
}
al::vector<std::string> list;
Binary file not shown.