diff --git a/stepmania/src/RageSoundReader.h b/stepmania/src/RageSoundReader.h index 55448afd79..29de6e149b 100644 --- a/stepmania/src/RageSoundReader.h +++ b/stepmania/src/RageSoundReader.h @@ -3,7 +3,6 @@ #ifndef RAGE_SOUND_READER_H #define RAGE_SOUND_READER_H -#define SoundReader RageSoundReader class RageSoundReader { public: @@ -12,8 +11,8 @@ public: virtual int SetPosition_Accurate( int ms ) = 0; virtual int SetPosition_Fast( int ms ) { return SetPosition_Accurate(ms); } virtual int Read(char *buf, unsigned len) = 0; - virtual ~SoundReader() { } - virtual SoundReader *Copy() const = 0; + virtual ~RageSoundReader() { } + virtual RageSoundReader *Copy() const = 0; virtual int GetSampleRate() const = 0; virtual unsigned GetNumChannels() const { return 2; } /* 1 or 2 */ virtual bool IsStreamingFromDisk() const = 0; diff --git a/stepmania/src/RageSoundReader_Chain.cpp b/stepmania/src/RageSoundReader_Chain.cpp index 7ef51e9740..f8b59097a2 100644 --- a/stepmania/src/RageSoundReader_Chain.cpp +++ b/stepmania/src/RageSoundReader_Chain.cpp @@ -31,7 +31,7 @@ RageSoundReader_Chain::~RageSoundReader_Chain() while( !m_apActiveSounds.empty() ) ReleaseSound( 0 ); - map::iterator it; + map::iterator it; for( it = m_apLoadedSounds.begin(); it != m_apLoadedSounds.end(); ++it ) delete it->second; } @@ -49,12 +49,12 @@ bool RageSoundReader_Chain::AddSound( RString sPath, float fOffsetSecs, float fP { sPath.MakeLower(); - map::const_iterator it; + map::const_iterator it; it = m_apLoadedSounds.find( sPath ); if( it == m_apLoadedSounds.end() ) { RString error; - SoundReader *pReader = SoundReader_FileReader::OpenFile( sPath, error ); + RageSoundReader *pReader = SoundReader_FileReader::OpenFile( sPath, error ); if( pReader == NULL ) { LOG->Warn( "RageSoundReader_Chain: error opening sound \"%s\": %s", @@ -80,7 +80,7 @@ int RageSoundReader_Chain::GetSampleRateInternal() const if( m_apLoadedSounds.empty() ) return m_iPreferredSampleRate; - map::const_iterator it; + map::const_iterator it; int iRate = -1; for( it = m_apLoadedSounds.begin(); it != m_apLoadedSounds.end(); ++it ) { @@ -99,7 +99,7 @@ void RageSoundReader_Chain::Finish() { sound &sound = m_Sounds[i]; - map::iterator it = m_apLoadedSounds.find( sound.sPath ); + map::iterator it = m_apLoadedSounds.find( sound.sPath ); if( it == m_apLoadedSounds.end() ) { m_Sounds.erase( m_Sounds.begin()+i ); @@ -111,7 +111,7 @@ void RageSoundReader_Chain::Finish() /* Figure out how many channels we have. */ m_iChannels = 1; - map::iterator it; + map::iterator it; for( it = m_apLoadedSounds.begin(); it != m_apLoadedSounds.end(); ++it ) m_iChannels = max( m_iChannels, it->second->GetNumChannels() ); @@ -131,7 +131,7 @@ void RageSoundReader_Chain::Finish() { for( it = m_apLoadedSounds.begin(); it != m_apLoadedSounds.end(); ++it ) { - SoundReader *&pSound = it->second; + RageSoundReader *&pSound = it->second; RageSoundReader_Resample_Good *pResample = new RageSoundReader_Resample_Good( pSound, m_iPreferredSampleRate ); pSound = pResample; @@ -143,7 +143,7 @@ void RageSoundReader_Chain::Finish() /* Attempt to preload all sounds. */ for( it = m_apLoadedSounds.begin(); it != m_apLoadedSounds.end(); ++it ) { - SoundReader *&pSound = it->second; + RageSoundReader *&pSound = it->second; RageSoundReader_Preload::PreloadSound( pSound ); } @@ -169,9 +169,9 @@ int RageSoundReader_Chain::SetPosition_Accurate( int ms ) if( sound.iOffsetMS > ms ) continue; - /* Find the SoundReader. */ + /* Find the RageSoundReader. */ int n = ActivateSound( sound ); - SoundReader *pSound = m_apActiveSounds[n].pSound; + RageSoundReader *pSound = m_apActiveSounds[n].pSound; int iOffsetMS = ms - sound.iOffsetMS; if( pSound->SetPosition_Accurate(iOffsetMS) == 0 ) @@ -194,7 +194,7 @@ int RageSoundReader_Chain::SetPosition_Accurate( int ms ) unsigned RageSoundReader_Chain::ActivateSound( const sound &s ) { - SoundReader *pSound = m_apLoadedSounds[s.sPath]; + RageSoundReader *pSound = m_apLoadedSounds[s.sPath]; ActiveSound add; add.fPan = s.fPan; @@ -207,7 +207,7 @@ unsigned RageSoundReader_Chain::ActivateSound( const sound &s ) void RageSoundReader_Chain::ReleaseSound( unsigned n ) { ASSERT_M( n < m_apActiveSounds.size(), ssprintf("%u, %u", n, unsigned(m_apActiveSounds.size())) ); - SoundReader *pSound = m_apActiveSounds[n].pSound; + RageSoundReader *pSound = m_apActiveSounds[n].pSound; delete pSound; @@ -216,7 +216,7 @@ void RageSoundReader_Chain::ReleaseSound( unsigned n ) bool RageSoundReader_Chain::IsStreamingFromDisk() const { - map::const_iterator it; + map::const_iterator it; for( it = m_apLoadedSounds.begin(); it != m_apLoadedSounds.end(); ++it ) if( it->second->IsStreamingFromDisk() ) return true; @@ -311,7 +311,7 @@ int RageSoundReader_Chain::ReadBlock( int16_t *pBuffer, int iFrames ) for( unsigned i = 0; i < m_apActiveSounds.size(); ) { ActiveSound &s = m_apActiveSounds[i]; - SoundReader *pSound = s.pSound; + RageSoundReader *pSound = s.pSound; int iSamples = min( iFramesToRead * pSound->GetNumChannels(), ARRAYLEN(Buffer) ); int iBytesRead = pSound->Read( (char *) Buffer, iSamples*sizeof(int16_t) ); if( iBytesRead == -1 || iBytesRead == 0 ) @@ -390,7 +390,7 @@ int RageSoundReader_Chain::GetLength() const for( unsigned i = 0; i < m_Sounds.size(); ++i ) { const sound &sound = m_Sounds[i]; - const SoundReader *pSound = m_apLoadedSounds.find( sound.sPath )->second; + const RageSoundReader *pSound = m_apLoadedSounds.find( sound.sPath )->second; int iThisLength = pSound->GetLength(); if( iThisLength ) iLength = max( iLength, iThisLength + sound.iOffsetMS ); @@ -404,7 +404,7 @@ int RageSoundReader_Chain::GetLength_Fast() const for( unsigned i = 0; i < m_Sounds.size(); ++i ) { const sound &sound = m_Sounds[i]; - const SoundReader *pSound = m_apLoadedSounds.find( sound.sPath )->second; + const RageSoundReader *pSound = m_apLoadedSounds.find( sound.sPath )->second; int iThisLength = pSound->GetLength_Fast(); if( iThisLength ) iLength = max( iLength, iThisLength + sound.iOffsetMS ); diff --git a/stepmania/src/RageSoundReader_Chain.h b/stepmania/src/RageSoundReader_Chain.h index c80e0cfb18..eeb5ee9f8e 100644 --- a/stepmania/src/RageSoundReader_Chain.h +++ b/stepmania/src/RageSoundReader_Chain.h @@ -8,7 +8,7 @@ #include #include -class RageSoundReader_Chain: public SoundReader +class RageSoundReader_Chain: public RageSoundReader { public: RageSoundReader_Chain(); @@ -48,7 +48,7 @@ private: int m_iActualSampleRate; unsigned m_iChannels; - map m_apLoadedSounds; + map m_apLoadedSounds; struct sound { @@ -66,7 +66,7 @@ private: unsigned m_iNextSound; struct ActiveSound { - SoundReader *pSound; + RageSoundReader *pSound; float fPan; bool operator< ( const ActiveSound &rhs ) const { return pSound < rhs.pSound; } }; diff --git a/stepmania/src/RageSoundReader_FileReader.cpp b/stepmania/src/RageSoundReader_FileReader.cpp index fbacc7cb19..bc27c270e1 100644 --- a/stepmania/src/RageSoundReader_FileReader.cpp +++ b/stepmania/src/RageSoundReader_FileReader.cpp @@ -82,7 +82,7 @@ SoundReader_FileReader *SoundReader_FileReader::TryOpenFile( RString filename, R return NULL; } -SoundReader *SoundReader_FileReader::OpenFile( RString filename, RString &error ) +RageSoundReader *SoundReader_FileReader::OpenFile( RString filename, RString &error ) { { RageFile TestOpen; diff --git a/stepmania/src/RageSoundReader_FileReader.h b/stepmania/src/RageSoundReader_FileReader.h index 749fcdcd97..64f2a46723 100644 --- a/stepmania/src/RageSoundReader_FileReader.h +++ b/stepmania/src/RageSoundReader_FileReader.h @@ -5,7 +5,7 @@ #include "RageSoundReader.h" -class SoundReader_FileReader: public SoundReader +class SoundReader_FileReader: public RageSoundReader { public: /* @@ -26,7 +26,7 @@ public: virtual bool IsStreamingFromDisk() const { return true; } virtual float GetStreamToSourceRatio() const { return 1.0f; } - static SoundReader *OpenFile( RString filename, RString &error ); + static RageSoundReader *OpenFile( RString filename, RString &error ); private: static SoundReader_FileReader *TryOpenFile( RString filename, RString &error, RString format, bool &bKeepTrying ); diff --git a/stepmania/src/RageSoundReader_Preload.cpp b/stepmania/src/RageSoundReader_Preload.cpp index 14e351fe78..4df3ce6405 100644 --- a/stepmania/src/RageSoundReader_Preload.cpp +++ b/stepmania/src/RageSoundReader_Preload.cpp @@ -9,7 +9,7 @@ /* If a sound is smaller than this, we'll load it entirely into memory. */ const unsigned max_prebuf_size = 1024*256; -bool RageSoundReader_Preload::PreloadSound( SoundReader *&pSound ) +bool RageSoundReader_Preload::PreloadSound( RageSoundReader *&pSound ) { RageSoundReader_Preload *pPreload = new RageSoundReader_Preload; if( !pPreload->Open(pSound) ) @@ -34,7 +34,7 @@ int RageSoundReader_Preload::GetTotalSamples() const return m_Buffer->size() / samplesize; } -bool RageSoundReader_Preload::Open( SoundReader *pSource ) +bool RageSoundReader_Preload::Open( RageSoundReader *pSource ) { ASSERT( pSource ); m_iSampleRate = pSource->GetSampleRate(); diff --git a/stepmania/src/RageSoundReader_Preload.h b/stepmania/src/RageSoundReader_Preload.h index 6e0e2eab34..3c2aec7380 100644 --- a/stepmania/src/RageSoundReader_Preload.h +++ b/stepmania/src/RageSoundReader_Preload.h @@ -6,13 +6,13 @@ #include "RageSoundReader.h" #include "RageUtil_AutoPtr.h" -class RageSoundReader_Preload: public SoundReader +class RageSoundReader_Preload: public RageSoundReader { public: RageSoundReader_Preload(); /* Return true if the sound has been preloaded, in which case source will * be deleted. Otherwise, return false. */ - bool Open( SoundReader *pSource ); + bool Open( RageSoundReader *pSource ); int GetLength() const; int GetLength_Fast() const; int SetPosition_Accurate( int iMS ); @@ -32,7 +32,7 @@ public: ~RageSoundReader_Preload() { } /* Attempt to preload a sound. pSound must be rewound. */ - static bool PreloadSound( SoundReader *&pSound ); + static bool PreloadSound( RageSoundReader *&pSound ); private: AutoPtrCopyOnWrite m_Buffer; diff --git a/stepmania/src/RageSoundReader_Resample_Good.h b/stepmania/src/RageSoundReader_Resample_Good.h index ebfe126edb..02b69b5536 100644 --- a/stepmania/src/RageSoundReader_Resample_Good.h +++ b/stepmania/src/RageSoundReader_Resample_Good.h @@ -39,7 +39,7 @@ private: vector m_apResamplers; /* one per channel */ - SoundReader *m_pSource; + RageSoundReader *m_pSource; int m_iSampleRate; int m_iDownFactor; float m_fRate; diff --git a/stepmania/src/RageSoundReader_SpeedChange.cpp b/stepmania/src/RageSoundReader_SpeedChange.cpp index 43b9692b7a..b2f227c488 100644 --- a/stepmania/src/RageSoundReader_SpeedChange.cpp +++ b/stepmania/src/RageSoundReader_SpeedChange.cpp @@ -6,7 +6,7 @@ static const int WINDOW_SIZE_MS = 30; -RageSoundReader_SpeedChange::RageSoundReader_SpeedChange( SoundReader *pSource ): +RageSoundReader_SpeedChange::RageSoundReader_SpeedChange( RageSoundReader *pSource ): RageSoundReader_Filter( pSource ) { m_Channels.resize( pSource->GetNumChannels() ); diff --git a/stepmania/src/RageSoundReader_SpeedChange.h b/stepmania/src/RageSoundReader_SpeedChange.h index b6e30413f4..8e62833794 100644 --- a/stepmania/src/RageSoundReader_SpeedChange.h +++ b/stepmania/src/RageSoundReader_SpeedChange.h @@ -8,7 +8,7 @@ class RageSoundReader_SpeedChange: public RageSoundReader_Filter { public: - RageSoundReader_SpeedChange( SoundReader *pSource ); + RageSoundReader_SpeedChange( RageSoundReader *pSource ); virtual int SetPosition_Accurate( int ms ); virtual int SetPosition_Fast( int ms );