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

Attempt to simplify some loops.

Browse Source
This commit is contained in:
Jason Felds
2013-05-01 23:05:43 -04:00
parent 9d237ae779
commit b7c07d6fe6
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageSoundReader_Chain.cpp
+14 -17
View File
@@ -33,8 +33,8 @@ RageSoundReader_Chain::~RageSoundReader_Chain()
while( !m_apActiveSounds.empty() ) while( !m_apActiveSounds.empty() )
ReleaseSound( m_apActiveSounds.front() ); ReleaseSound( m_apActiveSounds.front() );
FOREACH( RageSoundReader *, m_apLoadedSounds, it ) for (RageSoundReader *it : m_apLoadedSounds)
delete *it; delete it;
} }
RageSoundReader_Chain *RageSoundReader_Chain::Copy() const RageSoundReader_Chain *RageSoundReader_Chain::Copy() const
@@ -118,19 +118,19 @@ void RageSoundReader_Chain::Finish()
/* Figure out how many channels we have. All sounds must either have 1 or 2 channels, /* Figure out how many channels we have. All sounds must either have 1 or 2 channels,
* which will be converted as needed, or have the same number of channels. */ * which will be converted as needed, or have the same number of channels. */
m_iChannels = 1; m_iChannels = 1;
FOREACH( RageSoundReader *, m_apLoadedSounds, it ) for (RageSoundReader *it : m_apLoadedSounds)
m_iChannels = max( m_iChannels, (*it)->GetNumChannels() ); m_iChannels = max( m_iChannels, it->GetNumChannels() );
if( m_iChannels > 2 ) if( m_iChannels > 2 )
{ {
FOREACH( RageSoundReader *, m_apLoadedSounds, it ) for (RageSoundReader *it : m_apLoadedSounds)
{ {
if( (*it)->GetNumChannels() != m_iChannels ) if( it->GetNumChannels() != m_iChannels )
{ {
LOG->Warn( "Discarded sound with %i channels, not %i", LOG->Warn( "Discarded sound with %i channels, not %i",
(*it)->GetNumChannels(), m_iChannels ); it->GetNumChannels(), m_iChannels );
delete (*it); delete it;
(*it) = NULL; it = NULL;
} }
} }
} }
@@ -158,22 +158,19 @@ void RageSoundReader_Chain::Finish()
m_iActualSampleRate = GetSampleRateInternal(); m_iActualSampleRate = GetSampleRateInternal();
if( m_iActualSampleRate == -1 ) if( m_iActualSampleRate == -1 )
{ {
FOREACH( RageSoundReader *, m_apLoadedSounds, it ) for (RageSoundReader *it : m_apLoadedSounds)
{ {
RageSoundReader *&pSound = (*it); RageSoundReader_Resample_Good *pResample = new RageSoundReader_Resample_Good( it, m_iPreferredSampleRate );
it = pResample;
RageSoundReader_Resample_Good *pResample = new RageSoundReader_Resample_Good( pSound, m_iPreferredSampleRate );
pSound = pResample;
} }
m_iActualSampleRate = m_iPreferredSampleRate; m_iActualSampleRate = m_iPreferredSampleRate;
} }
/* Attempt to preload all sounds. */ /* Attempt to preload all sounds. */
FOREACH( RageSoundReader *, m_apLoadedSounds, it ) for (RageSoundReader *it : m_apLoadedSounds)
{ {
RageSoundReader *&pSound = (*it); RageSoundReader_Preload::PreloadSound( it );
RageSoundReader_Preload::PreloadSound( pSound );
} }
/* Sort the sounds by start time. */ /* Sort the sounds by start time. */