From ead6a8959dbcd101485c0fb94202c51324a4401f Mon Sep 17 00:00:00 2001
From: Erik Faye-Lund <kusmabite@gmail.com>
Date: Wed, 19 Dec 2007 21:30:09 +0000
Subject: [PATCH] refactoring

---
 syncdata.h          |  4 ++--
 synctracker2.cpp    |  6 ++++++
 synctracker2.vcproj |  2 +-
 trackview.cpp       | 15 +++++++++------
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/syncdata.h b/syncdata.h
index ab84a68..4db447e 100644
--- a/syncdata.h
+++ b/syncdata.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <string>
-#include <list>
 #include <map>
+
 #include <exception>
 #include <cmath>
 
@@ -69,7 +69,7 @@ public:
 	
 	size_t getTrackCount() { return tracks.size(); }
 	
-private:
+// private:
 	typedef std::map<const std::string, SyncTrack> TrackContainer;
 	TrackContainer tracks;
 };
diff --git a/synctracker2.cpp b/synctracker2.cpp
index 47f436c..2904ef8 100644
--- a/synctracker2.cpp
+++ b/synctracker2.cpp
@@ -66,6 +66,12 @@ int _tmain(int argc, _TCHAR* argv[])
 	SyncData syncData;
 	SyncTrack &testTrack = syncData.getTrack("test");
 	SyncTrack &test2Track = syncData.getTrack("test2");
+	for (int i = 0; i < 1 << 16; ++i)
+	{
+		char temp[256];
+		sprintf(temp, "gen %02d", i);
+		SyncTrack &temp2 = syncData.getTrack(temp);
+	}
 
 //	testTrack.setKeyFrame(0, SyncTrack::KeyFrame(1.0f));
 	testTrack.setKeyFrame(1, SyncTrack::KeyFrame(2.0f));
diff --git a/synctracker2.vcproj b/synctracker2.vcproj
index 77d472e..cf182ba 100644
--- a/synctracker2.vcproj
+++ b/synctracker2.vcproj
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
 				UsePrecompiledHeader="0"
diff --git a/trackview.cpp b/trackview.cpp
index aec156e..55bfe35 100644
--- a/trackview.cpp
+++ b/trackview.cpp
@@ -77,8 +77,15 @@ void TrackView::paintTopMargin(HDC hdc, RECT rcTracks)
 	int firstTrack = min(max(scrollPosX / trackWidth, 0), getTrackCount() - 1);
 	int lastTrack  = min(max(firstTrack + windowTracks + 1, 0), getTrackCount() - 1);
 
-	for (int track = firstTrack; track <= lastTrack; ++track)
+	SyncData *syncData = getSyncData();
+	if (NULL == syncData) return;
+	
+	SyncData::TrackContainer::iterator trackIter = syncData->tracks.begin();
+	for (int track = 0; track <= lastTrack; ++track, ++trackIter)
 	{
+		ASSERT(trackIter != syncData->tracks.end());
+		if (track < firstTrack) continue;
+
 		RECT topMargin;
 
 		topMargin.top = 0;
@@ -97,11 +104,7 @@ void TrackView::paintTopMargin(HDC hdc, RECT rcTracks)
 		DrawEdge(hdc, &fillRect, BDR_RAISEDINNER | BDR_RAISEDOUTER, BF_ADJUST | BF_LEFT | BF_RIGHT | BF_BOTTOM);
 		FillRect(hdc, &fillRect, bgBrush);
 
-		/* format the text */
-		TCHAR temp[256];
-		_sntprintf_s(temp, 256, _T("track %d"), track);
-
-		std::string trackName(temp);
+		std::string trackName = trackIter->first;
 		TextOut(hdc,
 			fillRect.left, 0,
 			trackName.c_str(), int(trackName.length())