From 229496cffbcccf3b71ae18640cd6902fcbb84dc7 Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Tue, 15 Mar 2022 09:30:57 +0100 Subject: [PATCH 1/2] sound/OpenAL/AL_CinematicAudio.cpp: Remove address check against array neo/sound/OpenAL/AL_CinematicAudio.cpp:246:6: warning: address of array 'this->alMusicBuffercin' will always evaluate to 'true' [-Wpointer-bool-conversion] if( alMusicBuffercin ) ~~ ^~~~~~~~~~~~~~~~ --- neo/sound/OpenAL/AL_CinematicAudio.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/neo/sound/OpenAL/AL_CinematicAudio.cpp b/neo/sound/OpenAL/AL_CinematicAudio.cpp index ccf837ef..2718da0d 100644 --- a/neo/sound/OpenAL/AL_CinematicAudio.cpp +++ b/neo/sound/OpenAL/AL_CinematicAudio.cpp @@ -243,10 +243,7 @@ void CinematicAudio_OpenAL::ShutdownAudio() } } - if( alMusicBuffercin ) - { - alDeleteBuffers( NUM_BUFFERS, alMusicBuffercin ); - } + alDeleteBuffers( NUM_BUFFERS, alMusicBuffercin ); while( !tBuffer.empty() ) { From 308d0138cb5f6d6c42c6cb52ccab961ea7ad7c91 Mon Sep 17 00:00:00 2001 From: Stephen Saunders Date: Wed, 23 Mar 2022 23:15:19 +0100 Subject: [PATCH 2/2] sound/OpenAL/AL_CinematicAudio.cpp: Zero out music buffer on shutdown --- neo/sound/OpenAL/AL_CinematicAudio.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/neo/sound/OpenAL/AL_CinematicAudio.cpp b/neo/sound/OpenAL/AL_CinematicAudio.cpp index 2718da0d..492474db 100644 --- a/neo/sound/OpenAL/AL_CinematicAudio.cpp +++ b/neo/sound/OpenAL/AL_CinematicAudio.cpp @@ -243,7 +243,14 @@ void CinematicAudio_OpenAL::ShutdownAudio() } } - alDeleteBuffers( NUM_BUFFERS, alMusicBuffercin ); + alDeleteBuffers( NUM_BUFFERS, &alMusicBuffercin[0] ); + if( CheckALErrors() == AL_NO_ERROR ) + { + for( int i = 0; i < NUM_BUFFERS; i++ ) + { + alMusicBuffercin[ i ] = 0; + } + } while( !tBuffer.empty() ) {