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

CString -> RString

Browse Source
This commit is contained in:
Chris Danford
2006-01-22 01:00:06 +00:00
parent 870ed267fc
commit 7f821e8cfc
578 changed files with 3943 additions and 3946 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/DSoundHelpers.cpp
+9 -9
View File
@@ -16,16 +16,16 @@
BOOL CALLBACK DSound::EnumCallback( LPGUID lpGuid, LPCSTR lpcstrDescription, LPCSTR lpcstrModule, LPVOID lpContext )
{
CString sLine = ssprintf( "DirectSound Driver: %s", lpcstrDescription );
RString sLine = ssprintf( "DirectSound Driver: %s", lpcstrDescription );
if( lpcstrModule[0] )
{
sLine += ssprintf( " %s", lpcstrModule );
#ifndef _XBOX
CString sPath = FindSystemFile( lpcstrModule );
RString sPath = FindSystemFile( lpcstrModule );
if( sPath != "" )
{
CString sVersion;
RString sVersion;
if( GetFileVersion(sPath, sVersion) )
sLine += ssprintf( " %s", sVersion.c_str() );
}
@@ -106,7 +106,7 @@ DSound::DSound()
m_pDS = NULL;
}
CString DSound::Init()
RString DSound::Init()
{
HRESULT hr;
if( FAILED( hr = DirectSoundCreate(NULL, &m_pDS, NULL) ) )
@@ -139,7 +139,7 @@ CString DSound::Init()
SetPrimaryBufferMode();
return CString();
return RString();
}
DSound::~DSound()
@@ -176,7 +176,7 @@ DSoundBuf::DSoundBuf()
m_pTempBuffer = NULL;
}
CString DSoundBuf::Init( DSound &ds, DSoundBuf::hw hardware,
RString DSoundBuf::Init( DSound &ds, DSoundBuf::hw hardware,
int iChannels, int iSampleRate, int iSampleBits, int iWriteAhead )
{
m_iChannels = iChannels;
@@ -294,7 +294,7 @@ CString DSoundBuf::Init( DSound &ds, DSoundBuf::hw hardware,
m_pTempBuffer = new char[m_iBufferSize];
return CString();
return RString();
}
void DSoundBuf::SetSampleRate( int hz )
@@ -429,7 +429,7 @@ void DSoundBuf::CheckUnderrun( int iCursorStart, int iCursorEnd )
int iMissedBy = iCursorEnd - m_iWriteCursor;
wrap( iMissedBy, m_iBufferSize );
CString s = ssprintf( "underrun: %i..%i (%i) filled but cursor at %i..%i; missed it by %i",
RString s = ssprintf( "underrun: %i..%i (%i) filled but cursor at %i..%i; missed it by %i",
iFirstByteFilled, m_iWriteCursor, m_iBufferBytesFilled, iCursorStart, iCursorEnd, iMissedBy );
if( m_iExtraWriteahead )
@@ -522,7 +522,7 @@ bool DSoundBuf::get_output_buf( char **pBuffer, unsigned *pBufferSize, int iChun
if( m_iExtraWriteahead )
{
int used = min( m_iExtraWriteahead, bytes_played );
CString s = ssprintf("used %i of %i (%i..%i)", used, m_iExtraWriteahead, iCursorStart, iCursorEnd );
RString s = ssprintf("used %i of %i (%i..%i)", used, m_iExtraWriteahead, iCursorStart, iCursorEnd );
s += "; last: ";
for( int i = 0; i < 4; ++i )
s += ssprintf( "%i, %i; ", m_iLastCursors[i][0], m_iLastCursors[i][1] );