Use a regular vector for the enumerated HRTF list

1 files changed, 3 insertions, 10 deletions

diff --git a/Alc/hrtf.h b/Alc/hrtf.h
index 71956691..a36e9738 100644
--- a/Alc/hrtf.h
+++ b/Alc/hrtf.h
@@ -6,12 +6,9 @@
 
 #include "alMain.h"
 #include "atomic.h"
+#include "vector.h"
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define HRTF_HISTORY_BITS   (6)
 #define HRTF_HISTORY_LENGTH (1<<HRTF_HISTORY_BITS)
 #define HRTF_HISTORY_MASK   (HRTF_HISTORY_LENGTH-1)
@@ -68,8 +65,8 @@ struct AngularPoint {
 
 void FreeHrtfs(void);
 
-vector_EnumeratedHrtf EnumerateHrtf(const char *devname);
-void FreeHrtfList(vector_EnumeratedHrtf *list);
+al::vector<EnumeratedHrtf> EnumerateHrtf(const char *devname);
+void FreeHrtfList(al::vector<EnumeratedHrtf> &list);
 struct Hrtf *GetLoadedHrtf(struct HrtfEntry *entry);
 void Hrtf_IncRef(struct Hrtf *hrtf);
 void Hrtf_DecRef(struct Hrtf *hrtf);
@@ -84,8 +81,4 @@ void GetHrtfCoeffs(const struct Hrtf *Hrtf, ALfloat elevation, ALfloat azimuth,
  */
 void BuildBFormatHrtf(const struct Hrtf *Hrtf, DirectHrtfState *state, ALsizei NumChannels, const struct AngularPoint *AmbiPoints, const ALfloat (*RESTRICT AmbiMatrix)[MAX_AMBI_COEFFS], ALsizei AmbiCount, const ALfloat *RESTRICT AmbiOrderHFGain);
 
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
 #endif /* ALC_HRTF_H */