From 536768c91b344b059f3e66d5a456518a005d903f Mon Sep 17 00:00:00 2001
From: "Devin J. Pohly" <djpohly@gmail.com>
Date: Wed, 8 May 2013 23:46:54 -0400
Subject: [PATCH] Split parsing from processing for BPMs/stops

---
 src/NotesLoaderSM.cpp | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/NotesLoaderSM.cpp b/src/NotesLoaderSM.cpp
index 587837785f..a811e40fd2 100644
--- a/src/NotesLoaderSM.cpp
+++ b/src/NotesLoaderSM.cpp
@@ -214,12 +214,8 @@ bool SMLoader::ProcessBPMs( TimingData &out, const RString line, const int rowsP
 {
 	vector<RString> arrayBPMChangeExpressions;
 	split( line, ",", arrayBPMChangeExpressions );
-	
-	// prepare storage variables for negative BPMs -> Warps.
-	float negBeat = -1;
-	float negBPM = 1;
-	float highspeedBeat = -1;
-	bool bNotEmpty = false;
+
+	vector< pair<float, float> > vBPMChanges;
 	
 	for( unsigned b=0; b<arrayBPMChangeExpressions.size(); b++ )
 	{
@@ -234,11 +230,25 @@ bool SMLoader::ProcessBPMs( TimingData &out, const RString line, const int rowsP
 			continue;
 		}
 
-		bNotEmpty = true;
-
 		const float fBeat = RowToBeat( arrayBPMChangeValues[0], rowsPerBeat );
 		const float fNewBPM = StringToFloat( arrayBPMChangeValues[1] );
 
+		vBPMChanges.push_back( make_pair(fBeat, fNewBPM) );
+	}
+
+	// prepare storage variables for negative BPMs -> Warps.
+	float negBeat = -1;
+	float negBPM = 1;
+	float highspeedBeat = -1;
+	bool bNotEmpty = false;
+	
+	for( unsigned b=0; b<vBPMChanges.size(); b++ )
+	{
+		const float fBeat = vBPMChanges[b].first;
+		const float fNewBPM = vBPMChanges[b].second;
+
+		bNotEmpty = true;
+
 		if( fNewBPM < 0.0f )
 		{
 			negBeat = fBeat;
@@ -284,9 +294,7 @@ void SMLoader::ProcessStops( TimingData &out, const RString line, const int rows
 	vector<RString> arrayFreezeExpressions;
 	split( line, ",", arrayFreezeExpressions );
 	
-	// Prepare variables for negative stop conversion.
-	float negBeat = -1;
-	float negPause = 0;
+	vector< pair<float, float> > vStops;
 
 	for( unsigned f=0; f<arrayFreezeExpressions.size(); f++ )
 	{
@@ -304,6 +312,18 @@ void SMLoader::ProcessStops( TimingData &out, const RString line, const int rows
 		const float fFreezeBeat = RowToBeat( arrayFreezeValues[0], rowsPerBeat );
 		const float fFreezeSeconds = StringToFloat( arrayFreezeValues[1] );
 
+		vStops.push_back( make_pair(fFreezeBeat, fFreezeSeconds) );
+	}
+	
+	// Prepare variables for negative stop conversion.
+	float negBeat = -1;
+	float negPause = 0;
+
+	for( unsigned f=0; f<vStops.size(); f++ )
+	{
+		const float fFreezeBeat = vStops[f].first;
+		const float fFreezeSeconds = vStops[f].second;
+
 		// Process the prior stop.
 		if( negPause > 0 )
 		{