From 726de6f23fef9be331bc7f237c48a700a8244cd0 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sat, 5 May 2007 06:50:47 +0000 Subject: [PATCH] Remove dead code and fix indenting. "hurk"? --- stepmania/src/RageSoundReader_Merge.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/stepmania/src/RageSoundReader_Merge.cpp b/stepmania/src/RageSoundReader_Merge.cpp index 5c207d6ef2..3f86e0bbcc 100644 --- a/stepmania/src/RageSoundReader_Merge.cpp +++ b/stepmania/src/RageSoundReader_Merge.cpp @@ -247,11 +247,9 @@ int RageSoundReader_Merge::Read( float *pBuffer, int iFrames ) // if( i == 0 ) //LOG->Trace( "*** %i", Difference(aNextSourceFrames[i], m_iNextSourceFrame + lrintf(iFramesRead * aRatios[i])) ); - if( i == 1 && Difference(aNextSourceFrames[i], m_iNextSourceFrame + lrintf(iFramesRead * aRatios[i])) > ERROR_CORRECTION_THRESHOLD ) - int q = 1; if( Difference(aNextSourceFrames[i], m_iNextSourceFrame + lrintf(iFramesRead * aRatios[i])) > ERROR_CORRECTION_THRESHOLD ) { -LOG->Trace( "*** hurk %i", Difference(aNextSourceFrames[i], m_iNextSourceFrame + lrintf(iFramesRead * aRatios[i])) ); + LOG->Trace( "*** hurk %i", Difference(aNextSourceFrames[i], m_iNextSourceFrame + lrintf(iFramesRead * aRatios[i])) ); break; } @@ -263,7 +261,6 @@ LOG->Trace( "*** hurk %i", Difference(aNextSourceFrames[i], m_iNextSourceFrame + LOG->Trace( "%i: at %i, expected %i", i, iAt, m_aSounds[i]->GetNextSourceFrame() ); } - int oldf = aNextSourceFrames[i]; aNextSourceFrames[i] = m_aSounds[i]->GetNextSourceFrame(); aRatios[i] = m_aSounds[i]->GetStreamToSourceRatio(); // LOG->Trace( "read %i from %i; %i -> %i", iGotFrames, i, oldf, aNextSourceFrames[i] );