adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed lockup if sbuf_size was zero

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@421 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2002-12-13 15:29:40 +00:00
parent 6f05813495
commit 441b71acd9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/sound/openal/trackplayer.c
+3 -2
View File
@@ -265,7 +265,8 @@ GetSoundData (void *data)
LockMutex (soundSource[SPEECH_SOURCE].stream_mutex); LockMutex (soundSource[SPEECH_SOURCE].stream_mutex);
if (soundSource[SPEECH_SOURCE].sample && soundSource[SPEECH_SOURCE].sample->decoder && if (soundSource[SPEECH_SOURCE].sample && soundSource[SPEECH_SOURCE].sample->decoder &&
PlayingStream (SPEECH_SOURCE) && soundSource[SPEECH_SOURCE].sbuffer) PlayingStream (SPEECH_SOURCE) && soundSource[SPEECH_SOURCE].sbuffer &&
soundSource[SPEECH_SOURCE].sbuf_size > 0)
{ {
float played_time = (GetTimeCounter () - soundSource[SPEECH_SOURCE].start_time) / float played_time = (GetTimeCounter () - soundSource[SPEECH_SOURCE].start_time) /
(float)ONE_SECOND; (float)ONE_SECOND;
@@ -284,7 +285,7 @@ GetSoundData (void *data)
//fprintf (stderr, "GetSoundData(): something's messed with timing, delta %d\n", delta); //fprintf (stderr, "GetSoundData(): something's messed with timing, delta %d\n", delta);
delta = 0; delta = 0;
} }
else if (delta > soundSource[SPEECH_SOURCE].sbuf_size * 2) else if (delta > (int)(soundSource[SPEECH_SOURCE].sbuf_size * 2))
{ {
//fprintf (stderr, "GetSoundData(): something's messed with timing, delta %d\n", delta); //fprintf (stderr, "GetSoundData(): something's messed with timing, delta %d\n", delta);
delta = 0; delta = 0;