From 0d42b00621f0ae1e96cd4931ef00ed7eb66e1be2 Mon Sep 17 00:00:00 2001
From: Thai Pangsakulyanont <org.yi.dttvb@gmail.com>
Date: Mon, 9 May 2011 22:41:49 +0700
Subject: [PATCH] [splittiming] Fix NotesLoaderDWI, NotesLoaderSM,
 NotesWriterSWI, NotesWriterSM by replace occurences of m_Timing with
 m_SongTiming. (224 build errors)

---
 src/NotesLoaderDWI.cpp | 10 +++++-----
 src/NotesLoaderSM.cpp  |  2 +-
 src/NotesWriterDWI.cpp | 22 +++++++++++-----------
 src/NotesWriterSM.cpp  | 34 +++++++++++++++++-----------------
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/NotesLoaderDWI.cpp b/src/NotesLoaderDWI.cpp
index b15c74252f..0c0f327e98 100644
--- a/src/NotesLoaderDWI.cpp
+++ b/src/NotesLoaderDWI.cpp
@@ -481,11 +481,11 @@ bool DWILoader::LoadFromDir( const RString &sPath_, Song &out, set<RString> &Bla
 			
 			if( PREFSMAN->m_bQuirksMode )
 			{
-				out.AddBPMSegment( BPMSegment(0, fBPM) );
+				out.m_SongTiming.AddBPMSegment( BPMSegment(0, fBPM) );
 			}
 			else{
 				if( fBPM > 0.0f )
-					out.AddBPMSegment( BPMSegment(0, fBPM) );
+					out.m_SongTiming.AddBPMSegment( BPMSegment(0, fBPM) );
 				else
 					LOG->UserLog( "Song file", sPath, "has an invalid BPM change at beat %f, BPM %f.",
 							  NoteRowToBeat(0), fBPM );
@@ -517,7 +517,7 @@ bool DWILoader::LoadFromDir( const RString &sPath_, Song &out, set<RString> &Bla
 
 		else if( 0==stricmp(sValueName,"GAP") )
 			// the units of GAP is 1/1000 second
-			out.m_Timing.m_fBeat0OffsetInSeconds = -atoi( sParams[1] ) / 1000.0f;
+			out.m_SongTiming.m_fBeat0OffsetInSeconds = -atoi( sParams[1] ) / 1000.0f;
 
 		else if( 0==stricmp(sValueName,"SAMPLESTART") )
 			out.m_fMusicSampleStartSeconds = ParseBrokenDWITimestamp(sParams[1], sParams[2], sParams[3]);
@@ -542,7 +542,7 @@ bool DWILoader::LoadFromDir( const RString &sPath_, Song &out, set<RString> &Bla
 				int iFreezeRow = BeatToNoteRow( StringToFloat(arrayFreezeValues[0]) / 4.0f );
 				float fFreezeSeconds = StringToFloat( arrayFreezeValues[1] ) / 1000.0f;
 				
-				out.AddStopSegment( StopSegment(iFreezeRow, fFreezeSeconds) );
+				out.m_SongTiming.AddStopSegment( StopSegment(iFreezeRow, fFreezeSeconds) );
 //				LOG->Trace( "Adding a freeze segment: beat: %f, seconds = %f", fFreezeBeat, fFreezeSeconds );
 			}
 		}
@@ -567,7 +567,7 @@ bool DWILoader::LoadFromDir( const RString &sPath_, Song &out, set<RString> &Bla
 				if( fBPM > 0.0f )
 				{
 					BPMSegment bs( iStartIndex, fBPM );
-					out.AddBPMSegment( bs );
+					out.m_SongTiming.AddBPMSegment( bs );
 				}
 				else
 				{
diff --git a/src/NotesLoaderSM.cpp b/src/NotesLoaderSM.cpp
index f937bdf78c..dee9aa1fb9 100644
--- a/src/NotesLoaderSM.cpp
+++ b/src/NotesLoaderSM.cpp
@@ -457,7 +457,7 @@ bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out, bool bFromCache
 		return false;
 	}
 
-	out.m_Timing.m_sFile = sPath;
+	out.m_SongTiming.m_sFile = sPath;
 	LoadTimingFromSMFile( msd, out.m_SongTiming );
 
 	for( unsigned i=0; i<msd.GetNumValues(); i++ )
diff --git a/src/NotesWriterDWI.cpp b/src/NotesWriterDWI.cpp
index ce8ba00231..260728a70d 100644
--- a/src/NotesWriterDWI.cpp
+++ b/src/NotesWriterDWI.cpp
@@ -350,10 +350,10 @@ bool NotesWriterDWI::Write( RString sPath, const Song &out )
 	/* Write transliterations, if we have them, since DWI doesn't support UTF-8. */
 	f.PutLine( ssprintf("#TITLE:%s;", DwiEscape(out.GetTranslitFullTitle()).c_str()) );
 	f.PutLine( ssprintf("#ARTIST:%s;", DwiEscape(out.GetTranslitArtist()).c_str()) );
-	ASSERT( out.m_Timing.m_BPMSegments[0].m_iStartRow == 0 );
+	ASSERT( out.m_SongTiming.m_BPMSegments[0].m_iStartRow == 0 );
 	f.PutLine( ssprintf("#FILE:%s;", DwiEscape(out.m_sMusicFile).c_str()) );
-	f.PutLine( ssprintf("#BPM:%.3f;", out.m_Timing.m_BPMSegments[0].GetBPM()) );
-	f.PutLine( ssprintf("#GAP:%ld;", -lrintf( out.m_Timing.m_fBeat0OffsetInSeconds*1000 )) );
+	f.PutLine( ssprintf("#BPM:%.3f;", out.m_SongTiming.m_BPMSegments[0].GetBPM()) );
+	f.PutLine( ssprintf("#GAP:%ld;", -lrintf( out.m_SongTiming.m_fBeat0OffsetInSeconds*1000 )) );
 	f.PutLine( ssprintf("#SAMPLESTART:%.3f;", out.m_fMusicSampleStartSeconds) );
 	f.PutLine( ssprintf("#SAMPLELENGTH:%.3f;", out.m_fMusicSampleLengthSeconds) );
 	if( out.m_sCDTitleFile.size() )
@@ -374,29 +374,29 @@ bool NotesWriterDWI::Write( RString sPath, const Song &out )
 		break;
 	}
 
-	if( !out.m_Timing.m_StopSegments.empty() )
+	if( !out.m_SongTiming.m_StopSegments.empty() )
 	{
 		f.Write( "#FREEZE:" );
 
-		for( unsigned i=0; i<out.m_Timing.m_StopSegments.size(); i++ )
+		for( unsigned i=0; i<out.m_SongTiming.m_StopSegments.size(); i++ )
 		{
-			const StopSegment &fs = out.m_Timing.m_StopSegments[i];
+			const StopSegment &fs = out.m_SongTiming.m_StopSegments[i];
 			f.Write( ssprintf("%.3f=%.3f", fs.m_iStartRow * 4.0f / ROWS_PER_BEAT,
 				roundf(fs.m_fStopSeconds*1000)) );
-			if( i != out.m_Timing.m_StopSegments.size()-1 )
+			if( i != out.m_SongTiming.m_StopSegments.size()-1 )
 				f.Write( "," );
 		}
 		f.PutLine( ";" );
 	}
 
-	if( out.m_Timing.m_BPMSegments.size() > 1)
+	if( out.m_SongTiming.m_BPMSegments.size() > 1)
 	{
 		f.Write( "#CHANGEBPM:" );
-		for( unsigned i=1; i<out.m_Timing.m_BPMSegments.size(); i++ )
+		for( unsigned i=1; i<out.m_SongTiming.m_BPMSegments.size(); i++ )
 		{
-			const BPMSegment &bs = out.m_Timing.m_BPMSegments[i];
+			const BPMSegment &bs = out.m_SongTiming.m_BPMSegments[i];
 			f.Write( ssprintf("%.3f=%.3f", bs.m_iStartRow * 4.0f / ROWS_PER_BEAT, bs.GetBPM() ) );
-			if( i != out.m_Timing.m_BPMSegments.size()-1 )
+			if( i != out.m_SongTiming.m_BPMSegments.size()-1 )
 				f.Write( "," );
 		}
 		f.PutLine( ";" );
diff --git a/src/NotesWriterSM.cpp b/src/NotesWriterSM.cpp
index 95d14e75fb..9414016732 100644
--- a/src/NotesWriterSM.cpp
+++ b/src/NotesWriterSM.cpp
@@ -76,7 +76,7 @@ static void WriteGlobalTags( RageFile &f, const Song &out )
 			f.PutLine( "#INSTRUMENTTRACK:" + s + ";\n" );
 		}
 	}
-	f.PutLine( ssprintf( "#OFFSET:%.3f;", out.m_Timing.m_fBeat0OffsetInSeconds ) );
+	f.PutLine( ssprintf( "#OFFSET:%.3f;", out.m_SongTiming.m_fBeat0OffsetInSeconds ) );
 	f.PutLine( ssprintf( "#SAMPLESTART:%.3f;", out.m_fMusicSampleStartSeconds ) );
 	f.PutLine( ssprintf( "#SAMPLELENGTH:%.3f;", out.m_fMusicSampleLengthSeconds ) );
 	if( out.m_fSpecifiedLastBeat > 0 )
@@ -111,25 +111,25 @@ static void WriteGlobalTags( RageFile &f, const Song &out )
 
 
 	f.Write( "#BPMS:" );
-	for( unsigned i=0; i<out.m_Timing.m_BPMSegments.size(); i++ )
+	for( unsigned i=0; i<out.m_SongTiming.m_BPMSegments.size(); i++ )
 	{
-		const BPMSegment &bs = out.m_Timing.m_BPMSegments[i];
+		const BPMSegment &bs = out.m_SongTiming.m_BPMSegments[i];
 
 		f.PutLine( ssprintf( "%.3f=%.3f", NoteRowToBeat(bs.m_iStartRow), bs.GetBPM() ) );
-		if( i != out.m_Timing.m_BPMSegments.size()-1 )
+		if( i != out.m_SongTiming.m_BPMSegments.size()-1 )
 			f.Write( "," );
 	}
 	f.PutLine( ";" );
 
 	f.Write( "#STOPS:" );
-	for( unsigned i=0; i<out.m_Timing.m_StopSegments.size(); i++ )
+	for( unsigned i=0; i<out.m_SongTiming.m_StopSegments.size(); i++ )
 	{
-		const StopSegment &fs = out.m_Timing.m_StopSegments[i];
+		const StopSegment &fs = out.m_SongTiming.m_StopSegments[i];
 
 		if(!fs.m_bDelay)
 		{
 			f.PutLine( ssprintf( "%.3f=%.3f", NoteRowToBeat(fs.m_iStartRow), fs.m_fStopSeconds ) );
-			if( i != out.m_Timing.m_StopSegments.size()-1 )
+			if( i != out.m_SongTiming.m_StopSegments.size()-1 )
 				f.Write( "," );
 		}
 	}
@@ -149,40 +149,40 @@ static void WriteGlobalTags( RageFile &f, const Song &out )
 	f.PutLine( ";" );
 
 	f.Write( "#DELAYS:" );
-	for( unsigned i=0; i<out.m_Timing.m_StopSegments.size(); i++ )
+	for( unsigned i=0; i<out.m_SongTiming.m_StopSegments.size(); i++ )
 	{
-		const StopSegment &fs = out.m_Timing.m_StopSegments[i];
+		const StopSegment &fs = out.m_SongTiming.m_StopSegments[i];
 
 		if( fs.m_bDelay )
 		{
 			f.PutLine( ssprintf( "%.3f=%.3f", NoteRowToBeat(fs.m_iStartRow), fs.m_fStopSeconds ) );
-			if( i != out.m_Timing.m_StopSegments.size()-1 )
+			if( i != out.m_SongTiming.m_StopSegments.size()-1 )
 				f.Write( "," );
 		}
 	}
 	f.PutLine( ";" );
 
-	ASSERT( !out.m_Timing.m_vTimeSignatureSegments.empty() );
+	ASSERT( !out.m_SongTiming.m_vTimeSignatureSegments.empty() );
 	f.Write( "#TIMESIGNATURES:" );
-	FOREACH_CONST( TimeSignatureSegment, out.m_Timing.m_vTimeSignatureSegments, iter )
+	FOREACH_CONST( TimeSignatureSegment, out.m_SongTiming.m_vTimeSignatureSegments, iter )
 	{
 		f.PutLine( ssprintf( "%.3f=%d=%d", NoteRowToBeat(iter->m_iStartRow), 
 				    iter->m_iNumerator, iter->m_iDenominator ) );
 		vector<TimeSignatureSegment>::const_iterator iter2 = iter;
 		iter2++;
-		if( iter2 != out.m_Timing.m_vTimeSignatureSegments.end() )
+		if( iter2 != out.m_SongTiming.m_vTimeSignatureSegments.end() )
 			f.Write( "," );
 	}
 	f.PutLine( ";" );
 
-	ASSERT( !out.m_Timing.m_TickcountSegments.empty() );
+	ASSERT( !out.m_SongTiming.m_TickcountSegments.empty() );
 	f.Write( "#TICKCOUNTS:" );
-	for( unsigned i=0; i<out.m_Timing.m_TickcountSegments.size(); i++ )
+	for( unsigned i=0; i<out.m_SongTiming.m_TickcountSegments.size(); i++ )
 	{
-		const TickcountSegment &ts = out.m_Timing.m_TickcountSegments[i];
+		const TickcountSegment &ts = out.m_SongTiming.m_TickcountSegments[i];
 		
 		f.PutLine( ssprintf( "%.3f=%d", NoteRowToBeat(ts.m_iStartRow), ts.m_iTicks ) );
-		if( i != out.m_Timing.m_TickcountSegments.size()-1 )
+		if( i != out.m_SongTiming.m_TickcountSegments.size()-1 )
 			f.Write( "," );
 	}
 	f.PutLine( ";" );