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

FillBuf: take frames

Browse Source
This commit is contained in:
Glenn Maynard
2004-03-26 03:19:55 +00:00
parent 02fa396548
commit 88025a50cb
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSound.cpp
+6 -9
View File
@@ -193,10 +193,7 @@ bool RageSound::Load(CString sSoundFilePath, int precache)
* two chunks for each file at a time, which reduces the chance of underrun. */ * two chunks for each file at a time, which reduces the chance of underrun. */
void RageSound::Update(float delta) void RageSound::Update(float delta)
{ {
// LockMut(SOUNDMAN->lock); LockMut(SOUNDMAN->lock);
// if( playing && delta )
// FillBuf(int(delta * GetSampleRate() * framesize));
/* Erase old pos_map data. */ /* Erase old pos_map data. */
CleanPosMap( pos_map ); CleanPosMap( pos_map );
@@ -269,7 +266,7 @@ void RageSound::RateChange(char *buf, int &cnt,
/* Fill the buffer by about "bytes" worth of data. (We might go a little /* Fill the buffer by about "bytes" worth of data. (We might go a little
* over, and we won't overflow our buffer.) Return the number of bytes * over, and we won't overflow our buffer.) Return the number of bytes
* actually read; 0 = EOF. */ * actually read; 0 = EOF. */
int RageSound::FillBuf(int bytes) int RageSound::FillBuf( int frames )
{ {
LockMut(SOUNDMAN->lock); LockMut(SOUNDMAN->lock);
@@ -277,7 +274,7 @@ int RageSound::FillBuf(int bytes)
bool got_something = false; bool got_something = false;
while(bytes > 0) while( frames > 0 )
{ {
if(read_block_size > databuf.num_writable()) if(read_block_size > databuf.num_writable())
break; /* full */ break; /* full */
@@ -316,7 +313,7 @@ int RageSound::FillBuf(int bytes)
/* Add the data to the buffer. */ /* Add the data to the buffer. */
databuf.write((const char *) inbuf, cnt); databuf.write((const char *) inbuf, cnt);
bytes -= cnt; frames -= cnt/framesize;
got_something = true; got_something = true;
} }
@@ -382,7 +379,7 @@ bool RageSound::GetDataToPlay( int16_t *buffer, int size, int &sound_frame, int
/* If we don't have any data left buffered, fill the buffer by /* If we don't have any data left buffered, fill the buffer by
* up to as much as we need. */ * up to as much as we need. */
if( !Bytes_Available() ) if( !Bytes_Available() )
FillBuf( size*framesize ); FillBuf( size );
/* Get a block of data. */ /* Get a block of data. */
int got = GetData( (char *) buffer, size*framesize ); int got = GetData( (char *) buffer, size*framesize );
@@ -411,7 +408,7 @@ bool RageSound::GetDataToPlay( int16_t *buffer, int size, int &sound_frame, int
/* Make sure we can get some data. If we can't, then we'll have /* Make sure we can get some data. If we can't, then we'll have
* nothing to send and we'll just end up coming back here. */ * nothing to send and we'll just end up coming back here. */
if( !Bytes_Available() ) if( !Bytes_Available() )
FillBuf( size*framesize ); FillBuf( size );
if( GetData(NULL, size*framesize) == 0 ) if( GetData(NULL, size*framesize) == 0 )
{ {
LOG->Warn( "Can't loop data in %s; no data available at start point %f", LOG->Warn( "Can't loop data in %s; no data available at start point %f",