TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix bogus memory leak warning in digi_mixer.cpp

Browse source 
u_mem runs too early.  Move the memory outside its view and rely on
Valgrind.
This commit is contained in:
Kp 2014-08-20 01:28:12 +00:00
parent 8b51e0fda5
commit cd9987968c
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
similar/arch/sdl/digi_mixer.cpp
View file

@ -56,17 +56,14 @@ struct RAIIMix_Chunk : public Mix_Chunk
{
~RAIIMix_Chunk()
{
#ifdef DEBUG_MEMORY_ALLOCATIONS
if (abuf)
#endif
d_free(abuf);
delete [] abuf;
}
};
static int digi_initialised = 0;
static int digi_mixer_max_channels = MAX_SOUND_SLOTS;
static inline int fix2byte(fix f) { return (f / 256) % 256; }
RAIIMix_Chunk SoundChunks[MAX_SOUNDS];
static RAIIMix_Chunk SoundChunks[MAX_SOUNDS];
ubyte channels[MAX_SOUND_SLOTS];
/* Initialise audio */
@ -152,12 +149,13 @@ static void mixdigi_convert_sound(int i)
if (MIX_DIGI_DEBUG) con_printf(CON_DEBUG,"converting %d (%d)", i, dlen);
SDL_BuildAudioCVT(&cvt, AUDIO_U8, 1, freq, out_format, out_channels, out_freq);
MALLOC(cvt.buf, Uint8, dlen * cvt.len_mult);
std::unique_ptr<Uint8[]> cvtbuf(new Uint8[dlen * cvt.len_mult]);
cvt.buf = cvtbuf.get();
cvt.len = dlen;
memcpy(cvt.buf, data, dlen);
if (SDL_ConvertAudio(&cvt)) con_printf(CON_DEBUG,"conversion of %d failed", i);
SoundChunks[i].abuf = cvt.buf;
SoundChunks[i].abuf = cvtbuf.release();
SoundChunks[i].alen = dlen * cvt.len_mult;
SoundChunks[i].allocated = 1;
SoundChunks[i].volume = 128; // Max volume = 128