From cbcab0b54ee5a18a219d595e0dce95fe3443c0af Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Nov 27 2016 00:45:45 +0000 Subject: Linux: Correct misuse of SDL_MixAudio memset needs to be used even with full volume. --- diff --git a/toonz/sources/common/tsound/tsound_sdl.cpp b/toonz/sources/common/tsound/tsound_sdl.cpp index 705f1e6..933f3e1 100644 --- a/toonz/sources/common/tsound/tsound_sdl.cpp +++ b/toonz/sources/common/tsound/tsound_sdl.cpp @@ -133,12 +133,8 @@ static void sdl_fill_audio(void *udata, Uint8 *stream, int len) { } /* Mix as much data as possible */ - len = (len > audio_len ? audio_len : len); - - // Mix with silence if we're not at full volume - if (_this->m_volume != SDL_MIX_MAXVOLUME) { - SDL_memset(stream, 0, len); - } + len = min(audio_len, len); + SDL_memset(stream, 0, len); SDL_MixAudio(stream, (Uint8 *)myData->entireFileBuffer + myData->byteOffset, len, _this->m_volume); myData->byteOffset += len;