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

RageSoundReader::Read(buf, unsigned bytes) -> (buf, int frames);

Browse Source 
return value in frames, not bytes
This commit is contained in:
Glenn Maynard
2006-12-10 03:56:36 +00:00
parent 7bcb489288
commit 25e67dd4dc
23 changed files with 112 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSound.cpp
+2 -4
View File
@@ -156,7 +156,7 @@ public:
int GetLength_Fast() const { return 0; }
int SetPosition_Accurate( int iFrame ) { return 0; }
int SetPosition_Fast( int iFrame ) { return 0; }
int Read(char *buf, unsigned len) { return 0; }
int Read( char *buf, int iFrames ) { return 0; }
RageSoundReader *Copy() const { return new RageSoundReader_Silence; }
int GetSampleRate() const { return 44100; }
bool IsStreamingFromDisk() const { return false; }
@@ -288,8 +288,7 @@ int RageSound::GetData( char *pBuffer, int iFrames )
fRate = m_pSource->GetStreamToSourceRatio();
int iNewSourceFrame = m_pSource->GetNextSourceFrame();
int iReadSize = iFrames * sizeof(int16_t) * m_pSource->GetNumChannels();
iGotFrames = m_pSource->Read( pBuffer, iReadSize );
iGotFrames = m_pSource->Read( pBuffer, iFrames );
if( iGotFrames == -1 )
{
Fail( m_pSource->GetError() );
@@ -297,7 +296,6 @@ int RageSound::GetData( char *pBuffer, int iFrames )
/* Pretend we got EOF. */
return 0;
}
iGotFrames /= sizeof(int16_t) * m_pSource->GetNumChannels();
/* If we didn't get any data, don't update iSourceFrame, so we just keep
* extrapolating if we're in M_CONTINUE. */