From d6d6fd73787bc159678a8c09cbf6833d2d336949 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Thu, 22 Apr 2021 10:13:49 -0700
Subject: Avoid using config methods in hrtf.cpp

---
 alc/hrtf.cpp | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'alc/hrtf.cpp')

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;
 }
 
-- 
cgit v1.2.3