actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Glenn Maynard
2002-12-14 00:22:18 +00:00
parent e42f13826f
commit 66de45e43a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSound.cpp
+8 -4
View File
@@ -238,8 +238,9 @@ int RageSound::stream_t::FillBuf(int bytes)
{ {
ASSERT(Sample); ASSERT(Sample);
bool got_something = false;
if(Sample->flags & SOUND_SAMPLEFLAG_EOF) if(Sample->flags & SOUND_SAMPLEFLAG_EOF)
return false; /* EOF */ return got_something; /* EOF */
while(bytes > 0) while(bytes > 0)
{ {
@@ -247,7 +248,10 @@ int RageSound::stream_t::FillBuf(int bytes)
break; /* full */ break; /* full */
int cnt = Sound_Decode(Sample); int cnt = Sound_Decode(Sample);
if(cnt == -1) if(Sample->flags & SOUND_SAMPLEFLAG_EOF)
return got_something; /* EOF */
if(Sample->flags & SOUND_SAMPLEFLAG_ERROR)
{ {
/* There was a fatal error; get it with Sound_GetError(). /* There was a fatal error; get it with Sound_GetError().
* XXX: How should we handle sound errors? We can't * XXX: How should we handle sound errors? We can't
@@ -262,11 +266,11 @@ int RageSound::stream_t::FillBuf(int bytes)
} }
buf.write((const char *)Sample->buffer, cnt); buf.write((const char *)Sample->buffer, cnt);
bytes -= cnt; bytes -= cnt;
got_something = true;
} }
return true; return got_something;
} }
/* Called by the mixer: return a block of sound data. /* Called by the mixer: return a block of sound data.