From 8737e2e70ffa2616743ef47ec1d42d997fe27617 Mon Sep 17 00:00:00 2001 From: raidho36 Date: Mon, 10 Jul 2017 03:14:41 +0300 Subject: [PATCH] C++11 VLA usage removed, prettifyed naming. --HG-- branch : minor --- src/modules/audio/openal/Audio.h | 4 ++-- src/modules/audio/openal/Source.cpp | 2 +- src/modules/audio/openal/Source.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/audio/openal/Audio.h b/src/modules/audio/openal/Audio.h index 54f006777..9d9badb07 100644 --- a/src/modules/audio/openal/Audio.h +++ b/src/modules/audio/openal/Audio.h @@ -137,12 +137,12 @@ private: ALCcontext *context; // The OpenAL effects - struct effectmapStorage + struct EffectMapStorage { Effect *effect; ALuint slot; }; - std::map effectmap; + std::map effectmap; std::stack slotlist; int MAX_SCENE_EFFECTS = 64; int MAX_SOURCE_EFFECTS = 64; diff --git a/src/modules/audio/openal/Source.cpp b/src/modules/audio/openal/Source.cpp index a0461b491..1bd92ff9d 100644 --- a/src/modules/audio/openal/Source.cpp +++ b/src/modules/audio/openal/Source.cpp @@ -392,7 +392,7 @@ bool Source::update() if (!isFinished()) { ALint processed; - ALuint buffers[this->buffers]; + ALuint buffers[MAX_BUFFERS]; float curOffsetSamples, curOffsetSecs, newOffsetSamples, newOffsetSecs; int freq = decoder->getSampleRate(); diff --git a/src/modules/audio/openal/Source.h b/src/modules/audio/openal/Source.h index 0f47e67bf..2e6f1cd39 100644 --- a/src/modules/audio/openal/Source.h +++ b/src/modules/audio/openal/Source.h @@ -228,12 +228,12 @@ private: Filter *directfilter = nullptr; - struct effectmapStorage + struct EffectMapStorage { Filter *filter; ALuint slot, target; }; - std::map effectmap; + std::map effectmap; std::stack slotlist; }; // Source