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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2004-09-06 09:53:41 +00:00
parent 4df3517b93
commit fa356decdf
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/DSoundHelpers.cpp
+5 -7
View File
@@ -396,22 +396,20 @@ bool DSoundBuf::get_output_buf( char **buffer, unsigned *bufsiz, int chunksize )
* in GetLatencySeconds(). * in GetLatencySeconds().
*/ */
/* If the buffer is full, we can't be underrunning. */
if( buffer_bytes_filled < buffersize )
{ {
int first_byte_filled = write_cursor-buffer_bytes_filled; int first_byte_filled = write_cursor-buffer_bytes_filled;
if( first_byte_filled < 0 ) if( first_byte_filled < 0 )
first_byte_filled += buffersize; /* unwrap */ first_byte_filled += buffersize; /* unwrap */
/* Data between the play cursor and the write cursor is committed to be /* Data between the play cursor and the write cursor is committed to be
* played. If we don't actually have data there, we've underrun. * played. If we don't actually have data there, we've underrun. */
* (If buffer_bytes_filled == buffersize, then it's full, and can't be
* an underrun.)
*/
/* We're already underrunning, which means the play cursor has passed valid /* We're already underrunning, which means the play cursor has passed valid
* data. Let's move the cursor forward. */ * data. Let's move the cursor forward. */
if( buffer_bytes_filled < buffersize && if( !contained(first_byte_filled, write_cursor, cursorstart) ||
(!contained(first_byte_filled, write_cursor, cursorstart) || !contained(first_byte_filled, write_cursor, cursorend) )
!contained(first_byte_filled, write_cursor, cursorend)) )
{ {
int missed_by = cursorend - write_cursor; int missed_by = cursorend - write_cursor;
wrap( missed_by, buffersize ); wrap( missed_by, buffersize );