Simple loops here.
This commit is contained in:
@@ -142,10 +142,10 @@ void AutoKeysounds::LoadTracks( const Song *pSong, RageSoundReader *&pShared, Ra
|
|||||||
|
|
||||||
|
|
||||||
vector<RageSoundReader *> vpSounds;
|
vector<RageSoundReader *> vpSounds;
|
||||||
FOREACH( RString, vsMusicFile, s )
|
for (RString const &s : vsMusicFile)
|
||||||
{
|
{
|
||||||
RString sError;
|
RString sError;
|
||||||
RageSoundReader *pSongReader = RageSoundReader_FileReader::OpenFile( *s, sError );
|
RageSoundReader *pSongReader = RageSoundReader_FileReader::OpenFile( s, sError );
|
||||||
vpSounds.push_back( pSongReader );
|
vpSounds.push_back( pSongReader );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -162,8 +162,8 @@ void AutoKeysounds::LoadTracks( const Song *pSong, RageSoundReader *&pShared, Ra
|
|||||||
{
|
{
|
||||||
RageSoundReader_Merge *pMerge = new RageSoundReader_Merge;
|
RageSoundReader_Merge *pMerge = new RageSoundReader_Merge;
|
||||||
|
|
||||||
FOREACH( RageSoundReader *, vpSounds, so )
|
for (RageSoundReader *so : vpSounds)
|
||||||
pMerge->AddSound( *so );
|
pMerge->AddSound( so );
|
||||||
pMerge->Finish( SOUNDMAN->GetDriverSampleRate() );
|
pMerge->Finish( SOUNDMAN->GetDriverSampleRate() );
|
||||||
|
|
||||||
RageSoundReader *pSongReader = pMerge;
|
RageSoundReader *pSongReader = pMerge;
|
||||||
@@ -308,8 +308,8 @@ void AutoKeysounds::FinishLoading()
|
|||||||
{
|
{
|
||||||
RageSoundReader_Merge *pMerge = new RageSoundReader_Merge;
|
RageSoundReader_Merge *pMerge = new RageSoundReader_Merge;
|
||||||
|
|
||||||
FOREACH( RageSoundReader *, apSounds, ps )
|
for (RageSoundReader *ps : apSounds)
|
||||||
pMerge->AddSound( *ps );
|
pMerge->AddSound( ps );
|
||||||
|
|
||||||
pMerge->Finish( SOUNDMAN->GetDriverSampleRate() );
|
pMerge->Finish( SOUNDMAN->GetDriverSampleRate() );
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user