aboutsummaryrefslogtreecommitdiffstats
path: root/al
diff options
context:
space:
mode:
Diffstat (limited to 'al')
-rw-r--r--al/auxeffectslot.cpp8
-rw-r--r--al/buffer.cpp5
-rw-r--r--al/effect.cpp4
-rw-r--r--al/error.cpp4
-rw-r--r--al/filter.cpp4
-rw-r--r--al/source.cpp13
6 files changed, 20 insertions, 18 deletions
diff --git a/al/auxeffectslot.cpp b/al/auxeffectslot.cpp
index c69990fe..3a3222b8 100644
--- a/al/auxeffectslot.cpp
+++ b/al/auxeffectslot.cpp
@@ -341,7 +341,7 @@ START_API_FUNC
}
else
{
- al::vector<ALuint> ids;
+ std::vector<ALuint> ids;
ALsizei count{n};
ids.reserve(static_cast<ALuint>(count));
do {
@@ -383,7 +383,7 @@ START_API_FUNC
}
else
{
- auto slots = al::vector<ALeffectslot*>(static_cast<ALuint>(n));
+ auto slots = std::vector<ALeffectslot*>(static_cast<ALuint>(n));
for(size_t i{0};i < slots.size();++i)
{
ALeffectslot *slot{LookupEffectSlot(context.get(), effectslots[i])};
@@ -466,7 +466,7 @@ START_API_FUNC
context->setError(AL_INVALID_VALUE, "Playing %d effect slots", n);
if(n <= 0) UNLIKELY return;
- auto slots = al::vector<ALeffectslot*>(static_cast<ALuint>(n));
+ auto slots = std::vector<ALeffectslot*>(static_cast<ALuint>(n));
std::lock_guard<std::mutex> _{context->mEffectSlotLock};
for(size_t i{0};i < slots.size();++i)
{
@@ -520,7 +520,7 @@ START_API_FUNC
context->setError(AL_INVALID_VALUE, "Stopping %d effect slots", n);
if(n <= 0) UNLIKELY return;
- auto slots = al::vector<ALeffectslot*>(static_cast<ALuint>(n));
+ auto slots = std::vector<ALeffectslot*>(static_cast<ALuint>(n));
std::lock_guard<std::mutex> _{context->mEffectSlotLock};
for(size_t i{0};i < slots.size();++i)
{
diff --git a/al/buffer.cpp b/al/buffer.cpp
index 1f008c8e..bfc10906 100644
--- a/al/buffer.cpp
+++ b/al/buffer.cpp
@@ -39,6 +39,7 @@
#include <optional>
#include <stdexcept>
#include <utility>
+#include <vector>
#include "AL/al.h"
#include "AL/alc.h"
@@ -345,7 +346,7 @@ void LoadData(ALCcontext *context, ALbuffer *ALBuf, ALsizei freq, ALuint size,
*/
if(newsize != ALBuf->mDataStorage.size())
{
- auto newdata = al::vector<std::byte,16>(newsize, std::byte{});
+ auto newdata = decltype(ALBuf->mDataStorage)(newsize, std::byte{});
if((access&AL_PRESERVE_DATA_BIT_SOFT))
{
const size_t tocopy{minz(newdata.size(), ALBuf->mDataStorage.size())};
@@ -663,7 +664,7 @@ START_API_FUNC
/* Store the allocated buffer IDs in a separate local list, to avoid
* modifying the user storage in case of failure.
*/
- al::vector<ALuint> ids;
+ std::vector<ALuint> ids;
ids.reserve(static_cast<ALuint>(n));
do {
ALbuffer *buffer{AllocBuffer(device)};
diff --git a/al/effect.cpp b/al/effect.cpp
index 3d91139a..3ca7c37e 100644
--- a/al/effect.cpp
+++ b/al/effect.cpp
@@ -31,6 +31,7 @@
#include <new>
#include <numeric>
#include <utility>
+#include <vector>
#include "AL/al.h"
#include "AL/alc.h"
@@ -49,7 +50,6 @@
#include "core/except.h"
#include "core/logging.h"
#include "opthelpers.h"
-#include "vector.h"
#ifdef ALSOFT_EAX
#include <cassert>
@@ -259,7 +259,7 @@ START_API_FUNC
/* Store the allocated buffer IDs in a separate local list, to avoid
* modifying the user storage in case of failure.
*/
- al::vector<ALuint> ids;
+ std::vector<ALuint> ids;
ids.reserve(static_cast<ALuint>(n));
do {
ALeffect *effect{AllocEffect(device)};
diff --git a/al/error.cpp b/al/error.cpp
index 39fd9f0a..b0607d66 100644
--- a/al/error.cpp
+++ b/al/error.cpp
@@ -31,6 +31,7 @@
#include <cstdio>
#include <cstring>
#include <mutex>
+#include <vector>
#include "AL/al.h"
#include "AL/alc.h"
@@ -41,14 +42,13 @@
#include "core/except.h"
#include "core/logging.h"
#include "opthelpers.h"
-#include "vector.h"
bool TrapALError{false};
void ALCcontext::setError(ALenum errorCode, const char *msg, ...)
{
- auto message = al::vector<char>(256);
+ auto message = std::vector<char>(256);
va_list args, args2;
va_start(args, msg);
diff --git a/al/filter.cpp b/al/filter.cpp
index 0fd8eaa8..11d71179 100644
--- a/al/filter.cpp
+++ b/al/filter.cpp
@@ -31,6 +31,7 @@
#include <mutex>
#include <new>
#include <numeric>
+#include <vector>
#include "AL/al.h"
#include "AL/alc.h"
@@ -43,7 +44,6 @@
#include "alnumeric.h"
#include "core/except.h"
#include "opthelpers.h"
-#include "vector.h"
namespace {
@@ -430,7 +430,7 @@ START_API_FUNC
/* Store the allocated buffer IDs in a separate local list, to avoid
* modifying the user storage in case of failure.
*/
- al::vector<ALuint> ids;
+ std::vector<ALuint> ids;
ids.reserve(static_cast<ALuint>(n));
do {
ALfilter *filter{AllocFilter(device)};
diff --git a/al/source.cpp b/al/source.cpp
index efe65332..1bfd5a94 100644
--- a/al/source.cpp
+++ b/al/source.cpp
@@ -42,6 +42,7 @@
#include <stdexcept>
#include <thread>
#include <utility>
+#include <vector>
#include "AL/al.h"
#include "AL/alc.h"
@@ -2659,7 +2660,7 @@ START_API_FUNC
}
else
{
- al::vector<ALuint> ids;
+ std::vector<ALuint> ids;
ids.reserve(static_cast<ALuint>(n));
do {
ALsource *source{AllocSource(context.get())};
@@ -3223,7 +3224,7 @@ START_API_FUNC
context->setError(AL_INVALID_VALUE, "Playing %d sources", n);
if(n <= 0) UNLIKELY return;
- al::vector<ALsource*> extra_sources;
+ std::vector<ALsource*> extra_sources;
std::array<ALsource*,8> source_storage;
al::span<ALsource*> srchandles;
if(static_cast<ALuint>(n) <= source_storage.size()) LIKELY
@@ -3261,7 +3262,7 @@ START_API_FUNC
if(start_time < 0) UNLIKELY
return context->setError(AL_INVALID_VALUE, "Invalid time point %" PRId64, start_time);
- al::vector<ALsource*> extra_sources;
+ std::vector<ALsource*> extra_sources;
std::array<ALsource*,8> source_storage;
al::span<ALsource*> srchandles;
if(static_cast<ALuint>(n) <= source_storage.size()) LIKELY
@@ -3301,7 +3302,7 @@ START_API_FUNC
context->setError(AL_INVALID_VALUE, "Pausing %d sources", n);
if(n <= 0) UNLIKELY return;
- al::vector<ALsource*> extra_sources;
+ std::vector<ALsource*> extra_sources;
std::array<ALsource*,8> source_storage;
al::span<ALsource*> srchandles;
if(static_cast<ALuint>(n) <= source_storage.size()) LIKELY
@@ -3377,7 +3378,7 @@ START_API_FUNC
context->setError(AL_INVALID_VALUE, "Stopping %d sources", n);
if(n <= 0) UNLIKELY return;
- al::vector<ALsource*> extra_sources;
+ std::vector<ALsource*> extra_sources;
std::array<ALsource*,8> source_storage;
al::span<ALsource*> srchandles;
if(static_cast<ALuint>(n) <= source_storage.size()) LIKELY
@@ -3440,7 +3441,7 @@ START_API_FUNC
context->setError(AL_INVALID_VALUE, "Rewinding %d sources", n);
if(n <= 0) UNLIKELY return;
- al::vector<ALsource*> extra_sources;
+ std::vector<ALsource*> extra_sources;
std::array<ALsource*,8> source_storage;
al::span<ALsource*> srchandles;
if(static_cast<ALuint>(n) <= source_storage.size()) LIKELY
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-27 01:13:41 +0000