From 5d4c63bf5ace421a700f5db02e6d1fbde555481c Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Tue, 10 May 2011 08:58:24 -0400
Subject: [PATCH] [splittiming] The .edit files matter too.

Maybe we need a new extension for edits.
---
 src/NotesLoaderSSC.cpp | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/NotesLoaderSSC.cpp b/src/NotesLoaderSSC.cpp
index ab7da6b480..59c7aed3ee 100644
--- a/src/NotesLoaderSSC.cpp
+++ b/src/NotesLoaderSSC.cpp
@@ -684,6 +684,8 @@ bool SSCLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePat
 	Song* pSong = NULL;
 	Steps* pNewNotes = NULL;
 	bool bSSCFormat = false;
+	bool bHasOwnTiming = false;
+	TimingData stepsTiming;
 
 	for( unsigned i=0; i<msd.GetNumValues(); i++ )
 	{
@@ -774,32 +776,54 @@ bool SSCLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePat
 			bSSCFormat = true;
 		}
 
-		// TimingData for Steps isn't set yet, but still prepare for it.
 		else if( sValueName=="BPMS" )
 		{
+			if( SMLoader::ProcessBPMs(stepsTiming, sParams[1]) )
+				bHasOwnTiming = true;
 			bSSCFormat = true;
 		}
+		
 		else if( sValueName=="STOPS" )
 		{
+			SMLoader::ProcessStops(stepsTiming, sParams[1]);
 			bSSCFormat = true;
 		}
+		
 		else if( sValueName=="DELAYS" )
 		{
+			SMLoader::ProcessDelays(stepsTiming, sParams[1]);
 			bSSCFormat = true;
 		}
+		
 		else if( sValueName=="TIMESIGNATURES" )
 		{
+			SMLoader::ProcessTimeSignatures(stepsTiming, sParams[1]);
 			bSSCFormat = true;
 		}
+		
 		else if( sValueName=="TICKCOUNTS" )
 		{
+			SMLoader::ProcessTickcounts(stepsTiming, sParams[1]);
 			bSSCFormat = true;
 		}
+		
 		else if( sValueName=="COMBOS" )
 		{
+			ProcessCombos(stepsTiming, sParams[1]);
+			bSSCFormat = true;
+		}
+		
+		else if( sValueName=="WARPS" )
+		{
+			ProcessWarps(stepsTiming, sParams[1]);
+			bSSCFormat = true;
+		}
+		
+		else if( sValueName=="LABELS" )
+		{
+			ProcessLabels(stepsTiming, sParams[1]);
 			bSSCFormat = true;
 		}
-
 		else if( sValueName=="NOTES" )
 		{
 			if( pSong == NULL )
@@ -819,6 +843,10 @@ bool SSCLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePat
 
 			if( bSSCFormat )
 			{
+				if ( bHasOwnTiming )
+				{
+					pNewNotes->m_Timing = stepsTiming;
+				}
 				pNewNotes->SetSMNoteData( sParams[1] );
 				pNewNotes->TidyUpData();
 				pSong->AddSteps( pNewNotes );