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

cleanup: don't cast bool to int

Browse Source
This commit is contained in:
Chris Danford
2005-03-16 04:10:10 +00:00
parent b4132c8919
commit c45c229995
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSound.cpp
+8 -4
View File
@@ -162,12 +162,16 @@ public:
}; };
bool RageSound::Load( CString sSoundFilePath, int precache ) bool RageSound::Load( CString sSoundFilePath )
{ {
LOG->Trace( "RageSound::LoadSound( '%s' )", sSoundFilePath.c_str() ); /* Automatically determine whether to precache */
/* TODO: Hook this up to a pref? */
return Load( sSoundFilePath, false );
}
if(precache == 2) bool RageSound::Load( CString sSoundFilePath, bool precache )
precache = false; {
LOG->Trace( "RageSound::LoadSound( '%s', %d )", sSoundFilePath.c_str(), precache );
CString error; CString error;
SoundReader *pSound = SoundReader_FileReader::OpenFile( sSoundFilePath, error ); SoundReader *pSound = SoundReader_FileReader::OpenFile( sSoundFilePath, error );
stepmania/src/RageSound.h
+8 -6
View File
@@ -75,23 +75,25 @@ public:
RageSound(const RageSound &cpy); RageSound(const RageSound &cpy);
RageSound &operator=( const RageSound &cpy ); RageSound &operator=( const RageSound &cpy );
/* If cache == true (1), we'll preload the entire file into memory if /* If cache == true, we'll preload the entire file into memory if
* it's small enough. If this is done, a large number of copies of the * it's small enough. If this is done, a large number of copies of the
* sound can be played without much performance penalty. This is useful * sound can be played without much performance penalty. This is useful
* for BM (keyed sounds), and for rapidly-repeating sound effects, such * for BM (keyed sounds), and for rapidly-repeating sound effects, such
* as the music wheel. * as the music wheel.
* *
* If cache == false (0), we'll never preload the file (always stream * If cache == false, we'll never preload the file (always stream
* it). This makes loads much faster. * it). This makes loads much faster.
* *
* If cache is 2 (the default), it means "don't care". Currently, this
* means false; this may become a preference.
*
* If the file failed to load, false is returned, Error() is set * If the file failed to load, false is returned, Error() is set
* and a null sample will be loaded. (This makes failed loads nonfatal; * and a null sample will be loaded. (This makes failed loads nonfatal;
* they can be ignored most of the time, so we continue to work if a file * they can be ignored most of the time, so we continue to work if a file
* is broken or missing.) */ * is broken or missing.) */
bool Load(CString fn, int precache = 2); bool Load( CString fn, bool bPrecache );
/*
* Using this version means the "don't care" about caching. Currently,
* this always will not cache the sound; this may become a preference.
*/
bool Load( CString fn );
/* Load a SoundReader that you've set up yourself. Sample rate conversion will /* Load a SoundReader that you've set up yourself. Sample rate conversion will
* be set up only if needed. Doesn't fail. */ * be set up only if needed. Doesn't fail. */