From fdcad04705c1f11c240be44d105bdb56c6fa5b32 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 26 Mar 2003 18:48:19 +0000
Subject: [PATCH] pull autosync into a separate function

---
 stepmania/src/Player.cpp | 40 +++++++++++++++++++++++-----------------
 stepmania/src/Player.h   |  1 +
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index c3a2c074f8..1fec82309f 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -394,23 +394,8 @@ void Player::Step( int col )
 		LOG->Trace("(%2d/%2d)Note offset: %f, Score: %i", m_iOffsetSample, SAMPLE_COUNT, fNoteOffset, score);
 		SetTapNoteScore(col, iIndexOverlappingNote, score);
 
-
-		if( GAMESTATE->m_SongOptions.m_bAutoSync  &&  score>=TNS_GREAT ) 
-		{
-			m_fOffset[m_iOffsetSample++] = fNoteOffset;
-			if (m_iOffsetSample >= SAMPLE_COUNT) 
-			{
-				float mean = calc_mean(m_fOffset, m_fOffset+SAMPLE_COUNT);
-				float stddev = calc_stddev(m_fOffset, m_fOffset+SAMPLE_COUNT);
-
-				if (stddev < .03 && stddev < fabsf(mean)) { //If they stepped with less than .03 error
-					GAMESTATE->m_pCurSong->m_fBeat0OffsetInSeconds += mean;
-					LOG->Trace("Offset corrected by %f. Error in steps: %f seconds.", mean, stddev);
-				} else
-					LOG->Trace("Offset NOT corrected. Average offset: %f seconds. Error: %f seconds.", mean, stddev);
-				m_iOffsetSample = 0;
-			}
-		}
+		if (score>=TNS_GREAT ) 
+			HandleAutosync(fNoteOffset);
 
 		if (score > TNS_NONE && IsRowComplete(iIndexOverlappingNote, TNS_BOO) )
 			OnRowDestroyed( score, iIndexOverlappingNote );
@@ -420,6 +405,27 @@ void Player::Step( int col )
 		m_GrayArrowRow.Step( col );
 }
 
+void Player::HandleAutosync(float fNoteOffset)
+{
+	if( !GAMESTATE->m_SongOptions.m_bAutoSync )
+		return;
+
+	m_fOffset[m_iOffsetSample++] = fNoteOffset;
+	if (m_iOffsetSample < SAMPLE_COUNT) 
+		return; /* need more */
+
+	const float mean = calc_mean(m_fOffset, m_fOffset+SAMPLE_COUNT);
+	const float stddev = calc_stddev(m_fOffset, m_fOffset+SAMPLE_COUNT);
+
+	if (stddev < .03 && stddev < fabsf(mean)) { //If they stepped with less than .03 error
+		GAMESTATE->m_pCurSong->m_fBeat0OffsetInSeconds += mean;
+		LOG->Trace("Offset corrected by %f. Error in steps: %f seconds.", mean, stddev);
+	} else
+		LOG->Trace("Offset NOT corrected. Average offset: %f seconds. Error: %f seconds.", mean, stddev);
+
+	m_iOffsetSample = 0;
+}
+
 void Player::OnRowDestroyed( TapNoteScore lastScore, int iIndexThatWasSteppedOn )
 {
 	LOG->Trace( "Player::OnRowDestroyed" );
diff --git a/stepmania/src/Player.h b/stepmania/src/Player.h
index 7e250b9f33..d6b6324a22 100644
--- a/stepmania/src/Player.h
+++ b/stepmania/src/Player.h
@@ -56,6 +56,7 @@ protected:
 	void OnRowDestroyed( TapNoteScore lastScore, int iStepIndex );
 	void HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNumTapsInRow );
 	void HandleHoldScore( HoldNoteScore holdScore, TapNoteScore tapScore );
+	void HandleAutosync(float fNoteOffset);
 
 	int GetClosestNoteDirectional( int col, float fBeat, float fMaxBeatsAhead, int iDirection );
 	int GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fMaxBeatsBehind );