From 1d68ed2cd57711f2d80bfbbda92683a48889739d Mon Sep 17 00:00:00 2001 From: gewlitys Date: Mon, 21 Apr 2003 01:18:12 +0000 Subject: [PATCH] Fixed buffer underrun handling in MixSDL (bug #211) git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@919 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 1 + sc2/src/sc2code/libs/sound/mixsdl/mixer.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index a8a29ea67..46f9c523b 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.3: +- Fixed MixSDL buffer underrun handling (bug #211) -Mika - Fix issue with caps lock and num lock preventing planet scan and lander message skipping (bug #299), from chmmravatar - Subtitles are now hidden after alien has finished talking (bug #312), diff --git a/sc2/src/sc2code/libs/sound/mixsdl/mixer.c b/sc2/src/sc2code/libs/sound/mixsdl/mixer.c index 328949d7f..ff362bc4e 100644 --- a/sc2/src/sc2code/libs/sound/mixsdl/mixer.c +++ b/sc2/src/sc2code/libs/sound/mixsdl/mixer.c @@ -672,7 +672,11 @@ mixSDL_SourcePlay (mixSDL_Object srcobj) else /* should make the source active */ { if (src->state < MIX_PLAYING) + { + if (src->firstqueued && !src->nextqueued) + mixSDL_SourceRewind_internal (src); mixSDL_SourceActivate (src); + } src->state = MIX_PLAYING; }