git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@802 b956fd51-792f-4845-bead-9b4dfca2ff2c

4 files changed, 289 insertions, 110 deletions

diff --git a/Game/Code/Classes/USongs.pas b/Game/Code/Classes/USongs.pas
index c5acec9c..2bf98151 100644
--- a/Game/Code/Classes/USongs.pas
+++ b/Game/Code/Classes/USongs.pas
@@ -149,7 +149,9 @@ begin
   inherited create( false );
   self.freeonterminate := true;
 
-  SongList := TList.create();
+  // This check is needed if PseudoThread is used:
+	if not Assigned(SongList) then
+	  SongList := TList.create(); 
 
   {$ifdef Delphi}
     fDirWatch := TDirectoryWatch.create(nil);
@@ -191,8 +193,8 @@ end;
 
 destructor TSongs.destroy();
 begin
-  freeandnil( SongList );

-end;

+  freeandnil( SongList );
+end;
 
 procedure TSongs.DoDirChanged(Sender: TObject);
 begin
@@ -227,7 +229,11 @@ begin
   try
     fProcessing := true;
 
-    SongList.clear;
+    {$IFDEF USE_PSEUDO_THREAD}
+		if not Assigned(SongList) then
+		  SongList := TList.create(); 
+		{$ENDIF}
+		SongList.clear;
     Log.LogError('SongList', 'Searching For Songs');
 
     // browse directories
diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3
index 89b83464..52f06983 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3
@@ -200,6 +200,126 @@
 			<key>Content</key>
 			<dict>
 				<key>PBXProjectModuleGUID</key>
+				<string>2CB9E8C70D43BECB00214DFA</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>USong.pas</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>2CB9E8C80D43BECB00214DFA</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>USong.pas</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>2CB9E90F0D43C6BD00214DFA</string>
+						<key>history</key>
+						<array>
+							<string>2CB9E9080D43C60E00214DFA</string>
+						</array>
+					</dict>
+					<key>SplitCount</key>
+					<string>1</string>
+				</dict>
+				<key>StatusBarVisibility</key>
+				<true/>
+			</dict>
+			<key>Geometry</key>
+			<dict>
+				<key>Frame</key>
+				<string>{{0, 20}, {993, 838}}</string>
+				<key>PBXModuleWindowStatusBarHidden2</key>
+				<false/>
+				<key>RubberWindowFrame</key>
+				<string>15 144 993 879 0 0 1680 1028 </string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
+				<string>2CB9E8990D43B80A00214DFA</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>USongs.pas</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>2CB9E89A0D43B80A00214DFA</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>USongs.pas</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>2CB9E9100D43C6BD00214DFA</string>
+						<key>history</key>
+						<array>
+							<string>2CB9E8F10D43C00200214DFA</string>
+						</array>
+					</dict>
+					<key>SplitCount</key>
+					<string>1</string>
+				</dict>
+				<key>StatusBarVisibility</key>
+				<true/>
+			</dict>
+			<key>Geometry</key>
+			<dict>
+				<key>Frame</key>
+				<string>{{0, 20}, {797, 748}}</string>
+				<key>PBXModuleWindowStatusBarHidden2</key>
+				<false/>
+				<key>RubberWindowFrame</key>
+				<string>15 212 797 789 0 0 1680 1028 </string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
+				<string>2CB9E8CA0D43BECB00214DFA</string>
+				<key>PBXProjectModuleLabel</key>
+				<string>UFiles.pas</string>
+				<key>PBXSplitModuleInNavigatorKey</key>
+				<dict>
+					<key>Split0</key>
+					<dict>
+						<key>PBXProjectModuleGUID</key>
+						<string>2CB9E8CB0D43BECB00214DFA</string>
+						<key>PBXProjectModuleLabel</key>
+						<string>UFiles.pas</string>
+						<key>_historyCapacity</key>
+						<integer>0</integer>
+						<key>bookmark</key>
+						<string>2CB9E9110D43C6BD00214DFA</string>
+						<key>history</key>
+						<array>
+							<string>2CB9E8BF0D43BD1400214DFA</string>
+						</array>
+					</dict>
+					<key>SplitCount</key>
+					<string>1</string>
+				</dict>
+				<key>StatusBarVisibility</key>
+				<true/>
+			</dict>
+			<key>Geometry</key>
+			<dict>
+				<key>Frame</key>
+				<string>{{0, 20}, {874, 786}}</string>
+				<key>PBXModuleWindowStatusBarHidden2</key>
+				<false/>
+				<key>RubberWindowFrame</key>
+				<string>84 133 874 827 0 0 1680 1028 </string>
+			</dict>
+		</dict>
+		<dict>
+			<key>Content</key>
+			<dict>
+				<key>PBXProjectModuleGUID</key>
 				<string>2C91297D0D43ADA1009299BF</string>
 				<key>PBXProjectModuleLabel</key>
 				<string>UPlatformMacOSX.pas</string>
@@ -214,10 +334,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2C91297F0D43ADA1009299BF</string>
+						<string>2CB9E9120D43C6BD00214DFA</string>
 						<key>history</key>
 						<array>
-							<string>2C9129710D43A23B009299BF</string>
+							<string>2C91297F0D43ADA1009299BF</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -233,7 +353,7 @@
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>79 110 776 900 0 0 1680 1028 </string>
+				<string>79 126 776 900 0 0 1680 1028 </string>
 			</dict>
 		</dict>
 		<dict>
@@ -254,10 +374,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2C9129820D43ADA1009299BF</string>
+						<string>2CB9E9130D43C6BD00214DFA</string>
 						<key>history</key>
 						<array>
-							<string>2C9129700D43A20F009299BF</string>
+							<string>2C9129820D43ADA1009299BF</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -273,7 +393,7 @@
 				<key>PBXModuleWindowStatusBarHidden2</key>
 				<false/>
 				<key>RubberWindowFrame</key>
-				<string>200 118 776 899 0 0 1680 1028 </string>
+				<string>200 127 776 899 0 0 1680 1028 </string>
 			</dict>
 		</dict>
 		<dict>
@@ -294,10 +414,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>2C9129830D43ADA1009299BF</string>
+						<string>2CB9E9140D43C6BD00214DFA</string>
 						<key>history</key>
 						<array>
-							<string>2C4D9D1C0D381F7A00270C66</string>
+							<string>2C9129830D43ADA1009299BF</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -502,9 +622,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>2C91297B0D43ADA1009299BF</string>
+				<string>2CB9E8830D43B7A600214DFA</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>2C91297C0D43ADA1009299BF</string>
+				<string>2CB9E8840D43B7A600214DFA</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -636,13 +756,19 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
+		<string>2CB9E8900D43B7A600214DFA</string>
+		<string>2CB9E8910D43B7A600214DFA</string>
+		<string>2CB9E8920D43B7A600214DFA</string>
 		<string>2C4D9D060D381D8200270C66</string>
-		<string>1CD10A99069EF8BA00B06720</string>
 		<string>2C9129800D43ADA1009299BF</string>
 		<string>2C91297D0D43ADA1009299BF</string>
-		<string>1C530D57069F1CE1000CFCEE</string>
 		<string>2C65660B0CF2236C0041F7DC</string>
+		<string>2CB9E8CA0D43BECB00214DFA</string>
+		<string>2CB9E8990D43B80A00214DFA</string>
 		<string>/Users/eddie/Projekte/UltraStarDX/trunk/Game/Code/MacOSX/UltraStarDX.xcodeproj</string>
+		<string>2CB9E8C70D43BECB00214DFA</string>
+		<string>1C78EAAD065D492600B07095</string>
+		<string>1CD10A99069EF8BA00B06720</string>
 	</array>
 	<key>WindowString</key>
 	<string>799 242 817 753 0 0 1680 1028 </string>
@@ -661,14 +787,12 @@
 					<key>Dock</key>
 					<array>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>UPlatformMacOSX.pas</string>
+								<string></string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -685,6 +809,8 @@
 							<string>546pt</string>
 						</dict>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -724,7 +850,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>2C65660B0CF2236C0041F7DC</string>
-				<string>2C9129840D43ADA1009299BF</string>
+				<string>2CB9E8880D43B7A600214DFA</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -818,10 +944,10 @@
 									<key>Frame</key>
 									<string>{{312, 0}, {591, 440}}</string>
 									<key>RubberWindowFrame</key>
-									<string>130 124 903 866 0 0 1680 1028 </string>
+									<string>13 162 903 866 0 0 1680 1028 </string>
 								</dict>
 								<key>RubberWindowFrame</key>
-								<string>130 124 903 866 0 0 1680 1028 </string>
+								<string>13 162 903 866 0 0 1680 1028 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXDebugSessionModule</string>
@@ -844,18 +970,18 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>2C9129850D43ADA1009299BF</string>
+				<string>2CB9E8890D43B7A600214DFA</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>2C9129860D43ADA1009299BF</string>
-				<string>2C9129870D43ADA1009299BF</string>
-				<string>2C9129880D43ADA1009299BF</string>
-				<string>2C9129890D43ADA1009299BF</string>
-				<string>2C91298A0D43ADA1009299BF</string>
+				<string>2CB9E88A0D43B7A600214DFA</string>
+				<string>2CB9E88B0D43B7A600214DFA</string>
+				<string>2CB9E88C0D43B7A600214DFA</string>
+				<string>2CB9E88D0D43B7A600214DFA</string>
+				<string>2CB9E88E0D43B7A600214DFA</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
 			<key>WindowString</key>
-			<string>130 124 903 866 0 0 1680 1028 </string>
+			<string>13 162 903 866 0 0 1680 1028 </string>
 			<key>WindowToolGUID</key>
 			<string>1CD10A99069EF8BA00B06720</string>
 			<key>WindowToolIsVisible</key>
@@ -1008,7 +1134,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>2C4D9C9E0D3811ED00270C66</string>
+				<string>2CB9E88F0D43B7A600214DFA</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
index 5e9049de..ef721549 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
@@ -93,9 +93,9 @@
 	};
 	2C4D9C6E0CC9EC8C0031092D /* UFiles.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1550, 10850}}";
-			sepNavSelRange = "{13981, 0}";
-			sepNavVisRange = "{13243, 859}";
+			sepNavIntBoundsRect = "{{0, 0}, {815, 2058}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{2415, 2047}";
 			sepNavVisRect = "{{0, 4494}, {923, 342}}";
 			sepNavWindowFrame = "{{84, 77}, {874, 883}}";
 		};
@@ -144,9 +144,9 @@
 	};
 	2C4D9C740CC9EC8C0031092D /* ULanguage.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {842, 3318}}";
-			sepNavSelRange = "{1263, 0}";
-			sepNavVisRange = "{1275, 723}";
+			sepNavIntBoundsRect = "{{0, 0}, {738, 3388}}";
+			sepNavSelRange = "{28, 58}";
+			sepNavVisRange = "{0, 1050}";
 			sepNavVisRect = "{{0, 914}, {923, 342}}";
 			sepNavWindowFrame = "{{153, 52}, {797, 845}}";
 		};
@@ -304,9 +304,9 @@
 	};
 	2C4D9C890CC9EC8C0031092D /* USongs.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {938, 13230}}";
-			sepNavSelRange = "{2259, 0}";
-			sepNavVisRange = "{26907, 1463}";
+			sepNavIntBoundsRect = "{{0, 0}, {872, 12992}}";
+			sepNavSelRange = "{6946, 0}";
+			sepNavVisRange = "{6493, 916}";
 			sepNavVisRect = "{{0, 4157}, {758, 716}}";
 			sepNavWindowFrame = "{{15, 156}, {797, 845}}";
 		};
@@ -321,9 +321,9 @@
 	};
 	2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {729, 16002}}";
-			sepNavSelRange = "{14991, 11}";
-			sepNavVisRange = "{14754, 1148}";
+			sepNavIntBoundsRect = "{{0, 0}, {842, 16254}}";
+			sepNavSelRange = "{15244, 0}";
+			sepNavVisRange = "{14754, 860}";
 			sepNavVisRect = "{{0, 3420}, {737, 826}}";
 			sepNavWindowFrame = "{{15, 68}, {776, 955}}";
 		};
@@ -354,22 +354,6 @@
 			sepNavWindowFrame = "{{15, 178}, {797, 845}}";
 		};
 	};
-	2C4D9D0E0D381DB000270C66 /* UScreenMain.pas:221 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */;
-		hitCount = 1;
-		ignoreCount = 0;
-		lineNumber = 221;
-		location = UltraStarDX;
-		modificationTime = 221781732.375473;
-		state = 1;
-	};
 	2C4D9D160D381EBD00270C66 /* UTexture.pas:318 */ = {
 		isa = PBXFileBreakpoint;
 		actions = (
@@ -383,35 +367,9 @@
 		ignoreCount = 0;
 		lineNumber = 318;
 		location = UltraStarDX;
-		modificationTime = 221781728.225761;
+		modificationTime = 222545419.290224;
 		state = 1;
 	};
-	2C4D9D1B0D381EEA00270C66 /* UTexture.pas:500 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */;
-		hitCount = 1;
-		ignoreCount = 0;
-		lineNumber = 500;
-		location = UltraStarDX;
-		modificationTime = 221781740.212444;
-		state = 1;
-	};
-	2C4D9D1C0D381F7A00270C66 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */;
-		name = "UScreenMain.pas: 221";
-		rLen = 0;
-		rLoc = 5112;
-		rType = 0;
-		vrLen = 1245;
-		vrLoc = 4506;
-	};
 	2C4D9D900CC9ED4F0031092D /* FreeBitmap.pas */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {974, 24374}}";
@@ -547,8 +505,9 @@
 	};
 	2C4D9E440CC9F0ED0031092D /* switches.inc */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {698, 644}}";
-			sepNavSelRange = "{312, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {686, 980}}";
+			sepNavSelRange = "{485, 14}";
+			sepNavVisRange = "{0, 1065}";
 			sepNavVisRect = "{{0, 7}, {577, 612}}";
 			sepNavWindowFrame = "{{15, 282}, {616, 741}}";
 		};
@@ -573,26 +532,18 @@
 			sepNavSelRange = "{830, 0}";
 			sepNavVisRange = "{241, 1433}";
 			sepNavVisRect = "{{0, 0}, {737, 826}}";
-			sepNavWindowFrame = "{{200, 62}, {776, 955}}";
+			sepNavWindowFrame = "{{200, 71}, {776, 955}}";
 		};
 	};
 	2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {881, 2002}}";
-			sepNavSelRange = "{696, 0}";
-			sepNavVisRange = "{0, 1327}";
+			sepNavIntBoundsRect = "{{0, 0}, {740, 1918}}";
+			sepNavSelRange = "{1020, 0}";
+			sepNavVisRange = "{23, 1818}";
 			sepNavVisRect = "{{0, 105}, {737, 827}}";
-			sepNavWindowFrame = "{{79, 54}, {776, 956}}";
+			sepNavWindowFrame = "{{79, 70}, {776, 956}}";
 		};
 	};
-	2C9129700D43A20F009299BF /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 2C8937290CE393FB005D8A87 /* UPlatform.pas */;
-	};
-	2C9129710D43A23B009299BF /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */;
-	};
 	2C91297F0D43ADA1009299BF /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */;
@@ -631,6 +582,92 @@
 			sepNavWindowFrame = "{{15, 140}, {874, 883}}";
 		};
 	};
+	2CB9E87D0D43B78400214DFA /* USong.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1550, 9898}}";
+			sepNavSelRange = "{19153, 0}";
+			sepNavVisRange = "{18561, 846}";
+			sepNavWindowFrame = "{{15, 88}, {993, 935}}";
+		};
+	};
+	2CB9E8BF0D43BD1400214DFA /* PBXBookmark */ = {
+		isa = PBXBookmark;
+		fRef = 2C4D9C6E0CC9EC8C0031092D /* UFiles.pas */;
+	};
+	2CB9E8F10D43C00200214DFA /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C890CC9EC8C0031092D /* USongs.pas */;
+		rLen = 0;
+		rLoc = 291;
+		rType = 1;
+	};
+	2CB9E9080D43C60E00214DFA /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2CB9E87D0D43B78400214DFA /* USong.pas */;
+		rLen = 0;
+		rLoc = 713;
+		rType = 1;
+	};
+	2CB9E90F0D43C6BD00214DFA /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2CB9E87D0D43B78400214DFA /* USong.pas */;
+		name = "USong.pas: 714";
+		rLen = 0;
+		rLoc = 19153;
+		rType = 0;
+		vrLen = 846;
+		vrLoc = 18561;
+	};
+	2CB9E9100D43C6BD00214DFA /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C890CC9EC8C0031092D /* USongs.pas */;
+		name = "USongs.pas: 292";
+		rLen = 0;
+		rLoc = 6946;
+		rType = 0;
+		vrLen = 916;
+		vrLoc = 6493;
+	};
+	2CB9E9110D43C6BD00214DFA /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C4D9C6E0CC9EC8C0031092D /* UFiles.pas */;
+		name = "UFiles.pas: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 2047;
+		vrLoc = 2415;
+	};
+	2CB9E9120D43C6BD00214DFA /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */;
+		name = "UPlatformMacOSX.pas: 31";
+		rLen = 0;
+		rLoc = 1020;
+		rType = 0;
+		vrLen = 1818;
+		vrLoc = 23;
+	};
+	2CB9E9130D43C6BD00214DFA /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2C8937290CE393FB005D8A87 /* UPlatform.pas */;
+		name = "UPlatform.pas: 31";
+		rLen = 0;
+		rLoc = 830;
+		rType = 0;
+		vrLen = 1433;
+		vrLoc = 241;
+	};
+	2CB9E9140D43C6BD00214DFA /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */;
+		name = "UScreenMain.pas: 220";
+		rLen = 0;
+		rLoc = 5112;
+		rType = 0;
+		vrLen = 1285;
+		vrLoc = 4486;
+	};
 	2CDC716B0CDB9CB70018F966 /* StrUtils.pas */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1013, 1022}}";
@@ -697,8 +734,8 @@
 	2CEA2AF00CE3868E0097A5FF /* PseudoThread.pas */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {842, 686}}";
-			sepNavSelRange = "{563, 0}";
-			sepNavVisRange = "{287, 430}";
+			sepNavSelRange = "{598, 0}";
+			sepNavVisRange = "{214, 458}";
 			sepNavVisRect = "{{0, 0}, {737, 826}}";
 			sepNavWindowFrame = "{{15, 68}, {776, 955}}";
 		};
@@ -779,7 +816,7 @@
 	};
 	2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {695, 4018}}";
+			sepNavIntBoundsRect = "{{0, 0}, {695, 3836}}";
 			sepNavSelRange = "{5112, 0}";
 			sepNavVisRange = "{4486, 1285}";
 			sepNavVisRect = "{{0, 0}, {715, 815}}";
@@ -1105,9 +1142,7 @@
 			DDC688D409F57523004E4BFF /* Put all program sources also in this target */,
 		);
 		breakpoints = (
-			2C4D9D0E0D381DB000270C66 /* UScreenMain.pas:221 */,
 			2C4D9D160D381EBD00270C66 /* UTexture.pas:318 */,
-			2C4D9D1B0D381EEA00270C66 /* UTexture.pas:500 */,
 		);
 		codeSenseManager = 2CDD4B6A0CB9357000549FAC /* Code sense */;
 		executables = (
@@ -1236,16 +1271,22 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 222536036;
-			PBXWorkspaceStateSaveDate = 222536036;
+			PBXPerProjectTemplateStateSaveDate = 222541603;
+			PBXWorkspaceStateSaveDate = 222541603;
 		};
 		perUserProjectItems = {
-			2C4D9D1C0D381F7A00270C66 /* PBXTextBookmark */ = 2C4D9D1C0D381F7A00270C66 /* PBXTextBookmark */;
-			2C9129700D43A20F009299BF /* PBXBookmark */ = 2C9129700D43A20F009299BF /* PBXBookmark */;
-			2C9129710D43A23B009299BF /* PBXBookmark */ = 2C9129710D43A23B009299BF /* PBXBookmark */;
 			2C91297F0D43ADA1009299BF /* PBXTextBookmark */ = 2C91297F0D43ADA1009299BF /* PBXTextBookmark */;
 			2C9129820D43ADA1009299BF /* PBXTextBookmark */ = 2C9129820D43ADA1009299BF /* PBXTextBookmark */;
 			2C9129830D43ADA1009299BF /* PBXTextBookmark */ = 2C9129830D43ADA1009299BF /* PBXTextBookmark */;
+			2CB9E8BF0D43BD1400214DFA /* PBXBookmark */ = 2CB9E8BF0D43BD1400214DFA /* PBXBookmark */;
+			2CB9E8F10D43C00200214DFA /* PBXTextBookmark */ = 2CB9E8F10D43C00200214DFA /* PBXTextBookmark */;
+			2CB9E9080D43C60E00214DFA /* PBXTextBookmark */ = 2CB9E9080D43C60E00214DFA /* PBXTextBookmark */;
+			2CB9E90F0D43C6BD00214DFA /* PBXTextBookmark */ = 2CB9E90F0D43C6BD00214DFA /* PBXTextBookmark */;
+			2CB9E9100D43C6BD00214DFA /* PBXTextBookmark */ = 2CB9E9100D43C6BD00214DFA /* PBXTextBookmark */;
+			2CB9E9110D43C6BD00214DFA /* PBXTextBookmark */ = 2CB9E9110D43C6BD00214DFA /* PBXTextBookmark */;
+			2CB9E9120D43C6BD00214DFA /* PBXTextBookmark */ = 2CB9E9120D43C6BD00214DFA /* PBXTextBookmark */;
+			2CB9E9130D43C6BD00214DFA /* PBXTextBookmark */ = 2CB9E9130D43C6BD00214DFA /* PBXTextBookmark */;
+			2CB9E9140D43C6BD00214DFA /* PBXTextBookmark */ = 2CB9E9140D43C6BD00214DFA /* PBXTextBookmark */;
 		};
 		sourceControlManager = 2CDD4B690CB9357000549FAC /* Source Control */;
 		userBuildSettings = {
diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj b/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
index 882b3563..307af5e6 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
@@ -144,6 +144,8 @@
 		2CAC2BF40D380AE800CA518A /* libbass.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2CAC2BF00D380AC200CA518A /* libbass.dylib */; };
 		2CAC2BF80D380B1B00CA518A /* Bass.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CAC2BF70D380B1B00CA518A /* Bass.pas */; };
 		2CAC2BF90D380B1B00CA518A /* Bass.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CAC2BF70D380B1B00CA518A /* Bass.pas */; };
+		2CB9E87E0D43B78400214DFA /* USong.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CB9E87D0D43B78400214DFA /* USong.pas */; };
+		2CB9E87F0D43B78400214DFA /* USong.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CB9E87D0D43B78400214DFA /* USong.pas */; };
 		2CDC716C0CDB9CB70018F966 /* StrUtils.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CDC716B0CDB9CB70018F966 /* StrUtils.pas */; };
 		2CDC716D0CDB9CB70018F966 /* StrUtils.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CDC716B0CDB9CB70018F966 /* StrUtils.pas */; };
 		2CDD4BDE0CB947A400549FAC /* sdl.pas in Sources */ = {isa = PBXBuildFile; fileRef = 98B8BE5C0B1F974F00162019 /* sdl.pas */; };
@@ -438,6 +440,7 @@
 		2CAC2BDF0D3809F500CA518A /* UAudioPlayback_Bass.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = UAudioPlayback_Bass.pas; path = ../Classes/UAudioPlayback_Bass.pas; sourceTree = SOURCE_ROOT; };
 		2CAC2BF00D380AC200CA518A /* libbass.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbass.dylib; path = ../lib/bass/libbass.dylib; sourceTree = SOURCE_ROOT; };
 		2CAC2BF70D380B1B00CA518A /* Bass.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = Bass.pas; path = ../lib/bass/MacOSX/Bass.pas; sourceTree = SOURCE_ROOT; };
+		2CB9E87D0D43B78400214DFA /* USong.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = USong.pas; path = ../Classes/USong.pas; sourceTree = SOURCE_ROOT; };
 		2CDC716B0CDB9CB70018F966 /* StrUtils.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = StrUtils.pas; path = ../../../Modis/SDK/StrUtils.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		2CDEA4F60CBD725B0096994C /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
 		2CE907900D1BC8A800A1FDFF /* libavcodec.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavcodec.dylib; path = ../lib/ffmpeg/libavcodec.dylib; sourceTree = SOURCE_ROOT; };
@@ -589,6 +592,7 @@
 		2CDD43820CBBE8D400F364DE /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				2CB9E87D0D43B78400214DFA /* USong.pas */,
 				2CAC2BDD0D3809F500CA518A /* UAudioInput_Bass.pas */,
 				2CAC2BDF0D3809F500CA518A /* UAudioPlayback_Bass.pas */,
 				2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */,
@@ -1155,6 +1159,7 @@
 				2CAC2BE20D3809F500CA518A /* UAudioInput_Bass.pas in Sources */,
 				2CAC2BE40D3809F500CA518A /* UAudioPlayback_Bass.pas in Sources */,
 				2CAC2BF80D380B1B00CA518A /* Bass.pas in Sources */,
+				2CB9E87E0D43B78400214DFA /* USong.pas in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1280,6 +1285,7 @@
 				2CAC2BE70D3809F500CA518A /* UAudioInput_Bass.pas in Sources */,
 				2CAC2BE90D3809F500CA518A /* UAudioPlayback_Bass.pas in Sources */,
 				2CAC2BF90D380B1B00CA518A /* Bass.pas in Sources */,
+				2CB9E87F0D43B78400214DFA /* USong.pas in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};