diff --git a/src/audio/ALAudio.cpp b/src/audio/ALAudio.cpp index ee179eef..22e418e7 100644 --- a/src/audio/ALAudio.cpp +++ b/src/audio/ALAudio.cpp @@ -188,7 +188,7 @@ uint ALAudio::getFreeSource(){ } ALuint id; alGenSources(1, &id); - if (!AL_GET_ERORR()) + if (!AL_GET_ERROR()) return 0; allsources.push_back(id); return id; @@ -200,13 +200,9 @@ uint ALAudio::getFreeBuffer(){ freebuffers.pop_back(); return buffer; } - if (allbuffers.size() == maxBuffers){ - std::cerr << "attempted to create new ALbuffer, but limit is " << maxBuffers << std::endl; - return 0; - } ALuint id; alGenBuffers(1, &id); - if (!AL_GET_ERORR()) { + if (!AL_GET_ERROR()) { return 0; } @@ -227,7 +223,7 @@ std::vector ALAudio::getAvailableDevices() const { const ALCchar* devices; devices = alcGetString(device, ALC_DEVICE_SPECIFIER); - if (!AL_GET_ERORR()) { + if (!AL_GET_ERROR()) { return devicesVec; } diff --git a/src/audio/ALAudio.h b/src/audio/ALAudio.h index 8be5e5dd..31024c2c 100644 --- a/src/audio/ALAudio.h +++ b/src/audio/ALAudio.h @@ -88,7 +88,6 @@ namespace audio { std::vector freebuffers; uint maxSources; - uint maxBuffers; ALAudio(ALCdevice* device, ALCcontext* context); public: diff --git a/src/audio/alutil.h b/src/audio/alutil.h index 09f068b9..ed7e37be 100644 --- a/src/audio/alutil.h +++ b/src/audio/alutil.h @@ -15,7 +15,7 @@ #include "../typedefs.h" #define AL_CHECK(STATEMENT) STATEMENT; AL::check_errors(__FILE__, __LINE__) -#define AL_GET_ERORR() AL::check_errors(__FILE__, __LINE__) +#define AL_GET_ERROR() AL::check_errors(__FILE__, __LINE__) namespace AL { bool check_errors(const std::string& filename, const std::uint_fast32_t line); diff --git a/src/coders/ogg.cpp b/src/coders/ogg.cpp index 641d15a7..ff1a0bcb 100644 --- a/src/coders/ogg.cpp +++ b/src/coders/ogg.cpp @@ -26,7 +26,6 @@ audio::PCM* ogg::load_pcm(const std::filesystem::path& file, bool headerOnly) { if ((code = ov_fopen(file.u8string().c_str(), &vf))) { throw std::runtime_error(vorbis_error_message(code)); } - std::vector data; vorbis_info* info = ov_info(&vf, -1); @@ -52,5 +51,5 @@ audio::PCM* ogg::load_pcm(const std::filesystem::path& file, bool headerOnly) { } ov_clear(&vf); - return new audio::PCM(data, channels, 16, sampleRate); + return new audio::PCM(std::move(data), channels, 16, sampleRate); }