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

Again with two.

Browse Source
This commit is contained in:
Jason Felds
2013-04-30 21:53:12 -04:00
parent 0f729945d2
commit 9a0f7a93e2
1 changed files with 332 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageSoundReader_Merge.cpp
+6 -5
View File
@@ -30,8 +30,8 @@ RageSoundReader_Merge::RageSoundReader_Merge( const RageSoundReader_Merge &cpy )
m_iNextSourceFrame = cpy.m_iNextSourceFrame;
m_fCurrentStreamToSourceRatio = cpy.m_fCurrentStreamToSourceRatio;
FOREACH_CONST( RageSoundReader *, cpy.m_aSounds, it )
m_aSounds.push_back( (*it)->Copy() );
for (RageSoundReader const *it : cpy.m_aSounds)
m_aSounds.push_back( it->Copy() );
}
void RageSoundReader_Merge::AddSound( RageSoundReader *pSound )
@@ -42,12 +42,13 @@ void RageSoundReader_Merge::AddSound( RageSoundReader *pSound )
/* If every sound has the same sample rate, return it. Otherwise, return -1. */
int RageSoundReader_Merge::GetSampleRateInternal() const
{
// TODO: Convert to a set and compare values?
int iRate = -1;
FOREACH_CONST( RageSoundReader *, m_aSounds, it )
for (RageSoundReader const *it : m_aSounds)
{
if( iRate == -1 )
iRate = (*it)->GetSampleRate();
else if( iRate != (*it)->GetSampleRate() )
iRate = it->GetSampleRate();
else if( iRate != it->GetSampleRate() )
return -1;
}
return iRate;