aboutsummaryrefslogtreecommitdiffstats
path: root/alc/hrtf.cpp
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2021-04-22 10:13:49 -0700
committerChris Robinson <[email protected]>2021-04-22 10:13:49 -0700
commitd6d6fd73787bc159678a8c09cbf6833d2d336949 (patch)
tree4fc2397c8685924e93eb6e8042402f50b4b228a8 /alc/hrtf.cpp
parent6ae12d0b8543934a320887729f9e82aa1a56865b (diff)
Avoid using config methods in hrtf.cpp
Diffstat (limited to 'alc/hrtf.cpp')
-rw-r--r--alc/hrtf.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/alc/hrtf.cpp b/alc/hrtf.cpp
index 6030bb65..3ab36622 100644
--- a/alc/hrtf.cpp
+++ b/alc/hrtf.cpp
@@ -42,7 +42,6 @@
#include "albit.h"
#include "albyte.h"
-#include "alconfig.h"
#include "alfstream.h"
#include "almalloc.h"
#include "alnumeric.h"
@@ -1217,13 +1216,13 @@ al::span<const char> GetResource(int name)
} // namespace
-al::vector<std::string> EnumerateHrtf(const char *devname)
+al::vector<std::string> EnumerateHrtf(al::optional<std::string> pathopt)
{
std::lock_guard<std::mutex> _{EnumeratedHrtfLock};
EnumeratedHrtfs.clear();
bool usedefaults{true};
- if(auto pathopt = ConfigValueStr(devname, nullptr, "hrtf-paths"))
+ if(pathopt)
{
const char *pathlist{pathopt->c_str()};
while(pathlist && *pathlist)
@@ -1271,15 +1270,6 @@ al::vector<std::string> EnumerateHrtf(const char *devname)
for(auto &entry : EnumeratedHrtfs)
list.emplace_back(entry.mDispName);
- if(auto defhrtfopt = ConfigValueStr(devname, nullptr, "default-hrtf"))
- {
- auto iter = std::find(list.begin(), list.end(), *defhrtfopt);
- if(iter == list.end())
- WARN("Failed to find default HRTF \"%s\"\n", defhrtfopt->c_str());
- else if(iter != list.begin())
- std::rotate(list.begin(), iter, iter+1);
- }
-
return list;
}