diff options
| author | Sven Gothel <sgothel@jausoft.com> | 2023-11-28 12:51:46 +0100 |
|---|---|---|
| committer | Sven Gothel <sgothel@jausoft.com> | 2023-11-28 12:51:46 +0100 |
| commit | 1aaf4f070011490bcece50394b9b32dfa593fd9e (patch) | |
| tree | 17d68284e401a35eea3d3a574d986d446a60763a /core/hrtf.h | |
| parent | 6e7cee4fa9a8af03f28ca26cd89f8357390dfc90 (diff) | |
| parent | 571b546f35eead77ce109f8d4dd6c3de3199d573 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'core/hrtf.h')
| -rw-r--r-- | core/hrtf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/hrtf.h b/core/hrtf.h index eb18682a..5e6e09a8 100644 --- a/core/hrtf.h +++ b/core/hrtf.h @@ -4,17 +4,17 @@ #include <array> #include <cstddef> #include <memory> +#include <optional> #include <string> +#include <vector> #include "almalloc.h" -#include "aloptional.h" #include "alspan.h" #include "atomic.h" #include "ambidefs.h" #include "bufferline.h" #include "mixer/hrtfdefs.h" #include "intrusive_ptr.h" -#include "vector.h" struct HrtfStore { @@ -83,7 +83,7 @@ struct DirectHrtfState { }; -al::vector<std::string> EnumerateHrtf(al::optional<std::string> pathopt); +std::vector<std::string> EnumerateHrtf(std::optional<std::string> pathopt); HrtfStorePtr GetLoadedHrtf(const std::string &name, const uint devrate); #endif /* CORE_HRTF_H */ |