From 01458632f830e41d3f1d14626b0d3b44a812cc5c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 6 Dec 2006 06:17:51 +0000 Subject: [PATCH] simplify --- stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp index 84a6e4cec7..090804b4d7 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp @@ -251,7 +251,7 @@ int RageSound_Generic_Software::GetDataForSound( sound &s ) sound_block *b = p[0]; int size = ARRAYLEN(b->buf)/channels; - bool eof = !s.snd->GetDataToPlay( b->buf, size, b->position, b->frames_in_buffer ); + s.snd->GetDataToPlay( b->buf, size, b->position, b->frames_in_buffer ); b->p = b->buf; s.buffer.advance_write_pointer( 1 ); @@ -259,7 +259,7 @@ int RageSound_Generic_Software::GetDataForSound( sound &s ) // LOG->Trace( "incr fr wr %i (state %i) (%p)", // (int) b->frames_in_buffer, s.state, s.snd ); - return eof? 0:size; + return b->frames_in_buffer; }