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

2 files changed, 266 insertions, 246 deletions

diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
index bc713544..7e214ce3 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser
@@ -1,71 +1,22 @@
 // !$*UTF8*$!
 {
-	2C2DB59F0CF64B6900786BB9 /* PBXTextBookmark */ = {
+	2C07C94F0D3582C9002A4079 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 2C4D9DCE0CC9EE6F0031092D /* UMenu.pas */;
+		fRef = 2C4D9C720CC9EC8C0031092D /* UIni.pas */;
+		name = "UIni.pas: 177";
 		rLen = 0;
-		rLoc = 768;
-		rType = 1;
-	};
-	2C2DB5A60CF64BA500786BB9 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9DCE0CC9EE6F0031092D /* UMenu.pas */;
-		name = "UMenu.pas: 752";
-		rLen = 0;
-		rLoc = 28010;
-		rType = 0;
-		vrLen = 1215;
-		vrLoc = 27813;
-	};
-	2C2DB5A70CF64BA500786BB9 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */;
-		name = "UScreenMain.pas: 150";
-		rLen = 0;
-		rLoc = 3430;
-		rType = 0;
-		vrLen = 1705;
-		vrLoc = 2876;
-	};
-	2C2DB5A80CF64BA500786BB9 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2CF54F430CDA1B2B00627463 /* UScreenCredits.pas */;
-		name = "UScreenCredits.pas: 768";
-		rLen = 471;
-		rLoc = 26865;
-		rType = 0;
-		vrLen = 2367;
-		vrLoc = 25405;
-	};
-	2C2DB5A90CF64BA500786BB9 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */;
-		name = "UTexture.pas: 637";
-		rLen = 0;
-		rLoc = 19395;
+		rLoc = 5110;
 		rType = 0;
-		vrLen = 1984;
-		vrLoc = 18649;
+		vrLen = 1173;
+		vrLoc = 4819;
 	};
-	2C2DB5AA0CF64BA500786BB9 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C880CC9EC8C0031092D /* USkins.pas */;
-		name = "USkins.pas: 138";
-		rLen = 0;
-		rLoc = 3097;
-		rType = 0;
-		vrLen = 1352;
-		vrLoc = 1935;
-	};
-	2C2DB5AB0CF64BA500786BB9 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C8C0CC9EC8C0031092D /* UThemes.pas */;
-		name = "UThemes.pas: 886";
-		rLen = 0;
-		rLoc = 25381;
-		rType = 0;
-		vrLen = 2043;
-		vrLoc = 24248;
+	2C4B70220CF757A400B0F0BD /* Until5000.dpr */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {691, 1218}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 1115}";
+			sepNavWindowFrame = "{{15, 465}, {750, 558}}";
+		};
 	};
 	2C4D9C620CC9EC8C0031092D /* TextGL.pas */ = {
 		uiCtxt = {
@@ -84,14 +35,6 @@
 			sepNavWindowFrame = "{{15, 178}, {797, 845}}";
 		};
 	};
-	2C4D9C640CC9EC8C0031092D /* UAudio_FFMpeg.pas */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1184, 13328}}";
-			sepNavSelRange = "{22697, 0}";
-			sepNavVisRect = "{{0, 12598}, {758, 716}}";
-			sepNavWindowFrame = "{{38, 157}, {797, 845}}";
-		};
-	};
 	2C4D9C650CC9EC8C0031092D /* UCatCovers.pas */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {923, 2128}}";
@@ -167,10 +110,11 @@
 	};
 	2C4D9C6E0CC9EC8C0031092D /* UFiles.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1562, 10850}}";
-			sepNavSelRange = "{8099, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {1550, 10850}}";
+			sepNavSelRange = "{13981, 0}";
+			sepNavVisRange = "{13243, 859}";
 			sepNavVisRect = "{{0, 4494}, {923, 342}}";
-			sepNavWindowFrame = "{{84, 219}, {616, 741}}";
+			sepNavWindowFrame = "{{84, 77}, {874, 883}}";
 		};
 	};
 	2C4D9C6F0CC9EC8C0031092D /* UGraphic.pas */ = {
@@ -200,8 +144,9 @@
 	};
 	2C4D9C720CC9EC8C0031092D /* UIni.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {770, 11102}}";
-			sepNavSelRange = "{41, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {758, 11340}}";
+			sepNavSelRange = "{5110, 0}";
+			sepNavVisRange = "{4819, 1173}";
 			sepNavVisRect = "{{0, 0}, {758, 716}}";
 			sepNavWindowFrame = "{{107, 94}, {797, 845}}";
 		};
@@ -216,8 +161,9 @@
 	};
 	2C4D9C740CC9EC8C0031092D /* ULanguage.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {923, 3346}}";
-			sepNavSelRange = "{1257, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {842, 3318}}";
+			sepNavSelRange = "{1263, 0}";
+			sepNavVisRange = "{1275, 723}";
 			sepNavVisRect = "{{0, 914}, {923, 342}}";
 			sepNavWindowFrame = "{{153, 52}, {797, 845}}";
 		};
@@ -257,20 +203,20 @@
 	};
 	2C4D9C7A0CC9EC8C0031092D /* ULyrics.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {738, 7476}}";
-			sepNavSelRange = "{169, 0}";
-			sepNavVisRange = "{0, 2043}";
+			sepNavIntBoundsRect = "{{0, 0}, {881, 10346}}";
+			sepNavSelRange = "{8686, 66}";
+			sepNavVisRange = "{8126, 1127}";
 			sepNavVisRect = "{{0, 4395}, {758, 716}}";
 			sepNavWindowFrame = "{{61, 136}, {797, 845}}";
 		};
 	};
 	2C4D9C7B0CC9EC8C0031092D /* UMain.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {842, 14980}}";
-			sepNavSelRange = "{7383, 0}";
-			sepNavVisRange = "{6895, 743}";
+			sepNavIntBoundsRect = "{{0, 0}, {993, 14658}}";
+			sepNavSelRange = "{6688, 0}";
+			sepNavVisRange = "{5814, 1323}";
 			sepNavVisRect = "{{0, 0}, {1013, 614}}";
-			sepNavWindowFrame = "{{222, 91}, {1052, 743}}";
+			sepNavWindowFrame = "{{30, 285}, {1052, 743}}";
 		};
 	};
 	2C4D9C7C0CC9EC8C0031092D /* UMedia_dummy.pas */ = {
@@ -364,17 +310,18 @@
 	};
 	2C4D9C880CC9EC8C0031092D /* USkins.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {738, 2464}}";
+			sepNavIntBoundsRect = "{{0, 0}, {738, 2534}}";
 			sepNavSelRange = "{3097, 0}";
-			sepNavVisRange = "{1935, 1352}";
+			sepNavVisRange = "{1981, 1318}";
 			sepNavVisRect = "{{0, 550}, {923, 342}}";
 			sepNavWindowFrame = "{{61, 136}, {797, 845}}";
 		};
 	};
 	2C4D9C890CC9EC8C0031092D /* USongs.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {950, 12908}}";
-			sepNavSelRange = "{7752, 9}";
+			sepNavIntBoundsRect = "{{0, 0}, {938, 13230}}";
+			sepNavSelRange = "{2259, 0}";
+			sepNavVisRange = "{26907, 1463}";
 			sepNavVisRect = "{{0, 4157}, {758, 716}}";
 			sepNavWindowFrame = "{{15, 156}, {797, 845}}";
 		};
@@ -389,18 +336,18 @@
 	};
 	2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {860, 16324}}";
-			sepNavSelRange = "{19395, 0}";
-			sepNavVisRange = "{18649, 1984}";
+			sepNavIntBoundsRect = "{{0, 0}, {717, 16506}}";
+			sepNavSelRange = "{12906, 0}";
+			sepNavVisRange = "{12038, 1920}";
 			sepNavVisRect = "{{0, 3420}, {737, 826}}";
 			sepNavWindowFrame = "{{15, 68}, {776, 955}}";
 		};
 	};
 	2C4D9C8C0CC9EC8C0031092D /* UThemes.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {738, 33124}}";
+			sepNavIntBoundsRect = "{{0, 0}, {738, 33208}}";
 			sepNavSelRange = "{25381, 0}";
-			sepNavVisRange = "{24248, 2043}";
+			sepNavVisRange = "{24314, 2017}";
 			sepNavVisRect = "{{0, 19678}, {923, 342}}";
 			sepNavWindowFrame = "{{28, 161}, {797, 845}}";
 		};
@@ -415,9 +362,9 @@
 	};
 	2C4D9C8E0CC9EC8C0031092D /* UVideo.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {746, 10024}}";
-			sepNavSelRange = "{12365, 13}";
-			sepNavVisRange = "{11732, 1140}";
+			sepNavIntBoundsRect = "{{0, 0}, {914, 9016}}";
+			sepNavSelRange = "{12966, 0}";
+			sepNavVisRange = "{12857, 955}";
 			sepNavVisRect = "{{0, 5722}, {749, 470}}";
 			sepNavWindowFrame = "{{15, 178}, {797, 845}}";
 		};
@@ -448,9 +395,9 @@
 	};
 	2C4D9DCC0CC9EE6F0031092D /* UDisplay.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {796, 6706}}";
-			sepNavSelRange = "{3871, 0}";
-			sepNavVisRange = "{7952, 477}";
+			sepNavIntBoundsRect = "{{0, 0}, {842, 6650}}";
+			sepNavSelRange = "{7897, 0}";
+			sepNavVisRange = "{7979, 593}";
 			sepNavVisRect = "{{0, 4834}, {758, 716}}";
 			sepNavWindowFrame = "{{38, 157}, {797, 845}}";
 		};
@@ -466,9 +413,9 @@
 	};
 	2C4D9DCE0CC9EE6F0031092D /* UMenu.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {842, 22372}}";
-			sepNavSelRange = "{28728, 0}";
-			sepNavVisRange = "{28445, 689}";
+			sepNavIntBoundsRect = "{{0, 0}, {1220, 21980}}";
+			sepNavSelRange = "{28010, 0}";
+			sepNavVisRange = "{27660, 1472}";
 			sepNavVisRect = "{{0, 3972}, {749, 470}}";
 			sepNavWindowFrame = "{{38, 157}, {797, 845}}";
 		};
@@ -547,10 +494,11 @@
 	};
 	2C4D9E040CC9EF840031092D /* OpenGL12.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1616, 65828}}";
-			sepNavSelRange = "{213686, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {1604, 65450}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{207947, 6380}";
 			sepNavVisRect = "{{0, 64932}, {1031, 840}}";
-			sepNavWindowFrame = "{{1, 53}, {1070, 969}}";
+			sepNavWindowFrame = "{{1, 63}, {1070, 965}}";
 		};
 	};
 	2C4D9E090CC9EF840031092D /* Windows.pas */ = {
@@ -569,71 +517,46 @@
 			sepNavWindowFrame = "{{15, 282}, {616, 741}}";
 		};
 	};
-	2C71B9290CF6478000048804 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2CF54F4A0CDA1B2B00627463 /* UScreenMain.pas */;
-		name = "UScreenMain.pas: 150";
-		rLen = 0;
-		rLoc = 3430;
-		rType = 0;
-		vrLen = 1719;
-		vrLoc = 2876;
-	};
-	2C71B92B0CF6478000048804 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2CF54F430CDA1B2B00627463 /* UScreenCredits.pas */;
-		name = "UScreenCredits.pas: 768";
-		rLen = 471;
-		rLoc = 26865;
-		rType = 0;
-		vrLen = 2367;
-		vrLoc = 25405;
-	};
-	2C71B92C0CF6478000048804 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C8B0CC9EC8C0031092D /* UTexture.pas */;
-		name = "UTexture.pas: 637";
-		rLen = 0;
-		rLoc = 19395;
-		rType = 0;
-		vrLen = 1984;
-		vrLoc = 18649;
+	2C5663EE0D35645700D4FF53 /* portaudio.pas */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {881, 16842}}";
+			sepNavSelRange = "{2289, 0}";
+			sepNavVisRange = "{7295, 1046}";
+		};
 	};
-	2C71B92D0CF6478000048804 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2C4D9C880CC9EC8C0031092D /* USkins.pas */;
-		name = "USkins.pas: 138";
-		rLen = 0;
-		rLoc = 3097;
-		rType = 0;
-		vrLen = 1352;
-		vrLoc = 1935;
+	2C56642B0D35683200D4FF53 /* SDLMain.m */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {881, 5404}}";
+			sepNavSelRange = "{247, 16}";
+			sepNavVisRange = "{0, 1181}";
+		};
 	};
-	2C71B92E0CF6478000048804 /* PBXTextBookmark */ = {
+	2C5A59420D35813800DCBB8F /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 2C4D9C8C0CC9EC8C0031092D /* UThemes.pas */;
-		name = "UThemes.pas: 886";
+		fRef = 2C4D9C720CC9EC8C0031092D /* UIni.pas */;
+		name = "UIni.pas: 177";
 		rLen = 0;
-		rLoc = 25381;
+		rLoc = 5110;
 		rType = 0;
-		vrLen = 2043;
-		vrLoc = 24248;
+		vrLen = 1173;
+		vrLoc = 4819;
 	};
 	2C8937290CE393FB005D8A87 /* UPlatform.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {717, 827}}";
-			sepNavSelRange = "{426, 0}";
-			sepNavVisRange = "{0, 1116}";
+			sepNavIntBoundsRect = "{{0, 0}, {776, 1638}}";
+			sepNavSelRange = "{2299, 15}";
+			sepNavVisRange = "{1739, 1083}";
 			sepNavVisRect = "{{0, 0}, {737, 826}}";
 			sepNavWindowFrame = "{{200, 62}, {776, 955}}";
 		};
 	};
 	2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {737, 938}}";
-			sepNavSelRange = "{1158, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {734, 1456}}";
+			sepNavSelRange = "{1212, 0}";
+			sepNavVisRange = "{473, 1363}";
 			sepNavVisRect = "{{0, 105}, {737, 827}}";
-			sepNavWindowFrame = "{{12, 61}, {776, 956}}";
+			sepNavWindowFrame = "{{79, 54}, {776, 956}}";
 		};
 	};
 	2CDC716B0CDB9CB70018F966 /* StrUtils.pas */ = {
@@ -670,6 +593,21 @@
 		sourceDirectories = (
 		);
 		variableFormatDictionary = {
+			$cs = 1;
+			$ds = 1;
+			$eax = 1;
+			$ebp = 1;
+			$ebx = 1;
+			$ecx = 1;
+			$edi = 1;
+			$edx = 1;
+			$eflags = 1;
+			$eip = 1;
+			$es = 1;
+			$esi = 1;
+			$esp = 1;
+			$gs = 1;
+			$ss = 1;
 		};
 	};
 	2CDD4B690CB9357000549FAC /* Source Control */ = {
@@ -686,8 +624,9 @@
 	};
 	2CEA2AF00CE3868E0097A5FF /* PseudoThread.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {737, 826}}";
-			sepNavSelRange = "{415, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {842, 686}}";
+			sepNavSelRange = "{563, 0}";
+			sepNavVisRange = "{287, 430}";
 			sepNavVisRect = "{{0, 0}, {737, 826}}";
 			sepNavWindowFrame = "{{15, 68}, {776, 955}}";
 		};
@@ -712,7 +651,7 @@
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {695, 19544}}";
 			sepNavSelRange = "{26865, 471}";
-			sepNavVisRange = "{25405, 2367}";
+			sepNavVisRange = "{25408, 2367}";
 			sepNavVisRect = "{{0, 1770}, {715, 815}}";
 			sepNavWindowFrame = "{{15, 79}, {754, 944}}";
 		};
@@ -769,7 +708,7 @@
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {695, 4102}}";
 			sepNavSelRange = "{3430, 0}";
-			sepNavVisRange = "{2876, 1705}";
+			sepNavVisRange = "{2860, 1701}";
 			sepNavVisRect = "{{0, 0}, {715, 815}}";
 			sepNavWindowFrame = "{{38, 79}, {754, 944}}";
 		};
@@ -912,8 +851,9 @@
 	};
 	2CF54F5C0CDA1B2B00627463 /* UScreenSing.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1262, 18480}}";
-			sepNavSelRange = "{49, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {920, 19586}}";
+			sepNavSelRange = "{12838, 0}";
+			sepNavVisRange = "{12982, 724}";
 			sepNavVisRect = "{{0, 0}, {715, 815}}";
 			sepNavWindowFrame = "{{38, 58}, {754, 944}}";
 		};
@@ -985,8 +925,9 @@
 	};
 	2CF5508B0CDA22B000627463 /* ModiSDK.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {998, 2072}}";
-			sepNavSelRange = "{30, 19}";
+			sepNavIntBoundsRect = "{{0, 0}, {986, 2128}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 2269}";
 			sepNavVisRect = "{{0, 0}, {715, 815}}";
 			sepNavWindowFrame = "{{15, 79}, {754, 944}}";
 		};
@@ -1025,16 +966,18 @@
 	};
 	2CF5529E0CDA42C900627463 /* avcodec.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1013, 28616}}";
-			sepNavSelRange = "{0, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {993, 28406}}";
+			sepNavSelRange = "{1536, 0}";
+			sepNavVisRange = "{0, 1591}";
 			sepNavVisRect = "{{0, 375}, {1013, 614}}";
 			sepNavWindowFrame = "{{176, 133}, {1052, 743}}";
 		};
 	};
 	2CF5529F0CDA42C900627463 /* avformat.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1013, 9828}}";
-			sepNavSelRange = "{0, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {993, 10206}}";
+			sepNavSelRange = "{1559, 189}";
+			sepNavVisRange = "{1159, 858}";
 			sepNavVisRect = "{{0, 298}, {1013, 614}}";
 			sepNavWindowFrame = "{{245, 70}, {1052, 743}}";
 		};
@@ -1049,8 +992,9 @@
 	};
 	2CF552A10CDA42C900627463 /* avutil.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1022, 2058}}";
-			sepNavSelRange = "{674, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {993, 2170}}";
+			sepNavSelRange = "{1520, 0}";
+			sepNavVisRange = "{0, 1756}";
 			sepNavVisRect = "{{0, 293}, {1013, 614}}";
 			sepNavWindowFrame = "{{222, 91}, {1052, 743}}";
 		};
@@ -1063,13 +1007,8 @@
 			sepNavWindowFrame = "{{38, 259}, {1052, 743}}";
 		};
 	};
-	9845B6590B1F9B9E0084DD62 /* SDL.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {948, 1330}}";
-			sepNavSelRange = "{273, 0}";
-			sepNavVisRect = "{{0, 0}, {948, 730}}";
-			sepNavWindowFrame = "{{61, 122}, {987, 859}}";
-		};
+	2CF77DB50CF7556C00F3B101 /* Modi_Until5000 */ = {
+		activeExec = 0;
 	};
 	98B8BE5C0B1F974F00162019 /* sdl.pas */ = {
 		uiCtxt = {
@@ -1079,14 +1018,6 @@
 			sepNavWindowFrame = "{{211, 143}, {987, 859}}";
 		};
 	};
-	98B8BE750B1F97F800162019 /* SDLMain.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {948, 5390}}";
-			sepNavSelRange = "{6150, 21}";
-			sepNavVisRect = "{{0, 2650}, {948, 730}}";
-			sepNavWindowFrame = "{{15, 164}, {987, 859}}";
-		};
-	};
 	DD37F2420A60255800975B2D /* fpcrtl */ = {
 		activeExec = 0;
 	};
@@ -1097,7 +1028,6 @@
 		activeTarget = DDC688C709F574E9004E4BFF /* UltraStarDX */;
 		addToTargets = (
 			DDC688C709F574E9004E4BFF /* UltraStarDX */,
-			DDC688D409F57523004E4BFF /* Put all program sources also in this target */,
 		);
 		breakpoints = (
 		);
@@ -1211,8 +1141,8 @@
 				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
 				PBXFileTableDataSourceColumnWidthsKey = (
 					20,
-					200,
-					110,
+					250,
+					60,
 					20,
 					48,
 					43,
@@ -1228,22 +1158,12 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 217466767;
-			PBXWorkspaceStateSaveDate = 217466767;
+			PBXPerProjectTemplateStateSaveDate = 221610651;
+			PBXWorkspaceStateSaveDate = 221610651;
 		};
 		perUserProjectItems = {
-			2C2DB59F0CF64B6900786BB9 /* PBXTextBookmark */ = 2C2DB59F0CF64B6900786BB9 /* PBXTextBookmark */;
-			2C2DB5A60CF64BA500786BB9 /* PBXTextBookmark */ = 2C2DB5A60CF64BA500786BB9 /* PBXTextBookmark */;
-			2C2DB5A70CF64BA500786BB9 /* PBXTextBookmark */ = 2C2DB5A70CF64BA500786BB9 /* PBXTextBookmark */;
-			2C2DB5A80CF64BA500786BB9 /* PBXTextBookmark */ = 2C2DB5A80CF64BA500786BB9 /* PBXTextBookmark */;
-			2C2DB5A90CF64BA500786BB9 /* PBXTextBookmark */ = 2C2DB5A90CF64BA500786BB9 /* PBXTextBookmark */;
-			2C2DB5AA0CF64BA500786BB9 /* PBXTextBookmark */ = 2C2DB5AA0CF64BA500786BB9 /* PBXTextBookmark */;
-			2C2DB5AB0CF64BA500786BB9 /* PBXTextBookmark */ = 2C2DB5AB0CF64BA500786BB9 /* PBXTextBookmark */;
-			2C71B9290CF6478000048804 /* PBXTextBookmark */ = 2C71B9290CF6478000048804 /* PBXTextBookmark */;
-			2C71B92B0CF6478000048804 /* PBXTextBookmark */ = 2C71B92B0CF6478000048804 /* PBXTextBookmark */;
-			2C71B92C0CF6478000048804 /* PBXTextBookmark */ = 2C71B92C0CF6478000048804 /* PBXTextBookmark */;
-			2C71B92D0CF6478000048804 /* PBXTextBookmark */ = 2C71B92D0CF6478000048804 /* PBXTextBookmark */;
-			2C71B92E0CF6478000048804 /* PBXTextBookmark */ = 2C71B92E0CF6478000048804 /* PBXTextBookmark */;
+			2C07C94F0D3582C9002A4079 /* PBXTextBookmark */ = 2C07C94F0D3582C9002A4079 /* PBXTextBookmark */;
+			2C5A59420D35813800DCBB8F /* PBXTextBookmark */ = 2C5A59420D35813800DCBB8F /* PBXTextBookmark */;
 		};
 		sourceControlManager = 2CDD4B690CB9357000549FAC /* Source Control */;
 		userBuildSettings = {
@@ -1251,10 +1171,11 @@
 	};
 	DDC6851B09F57195004E4BFF /* UltraStarDX.pas */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {948, 730}}";
-			sepNavSelRange = "{37, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {928, 731}}";
+			sepNavSelRange = "{58, 0}";
+			sepNavVisRange = "{0, 126}";
 			sepNavVisRect = "{{0, 0}, {948, 730}}";
-			sepNavWindowFrame = "{{189, 86}, {987, 859}}";
+			sepNavWindowFrame = "{{558, 105}, {987, 859}}";
 		};
 	};
 	DDC6868B09F571C2004E4BFF /* Info.plist */ = {
diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj b/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
index 447b1155..be2d67d4 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
@@ -7,9 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2C4B70230CF7581000B0F0BD /* Until5000.dpr in Sources */ = {isa = PBXBuildFile; fileRef = 2C4B70220CF757A400B0F0BD /* Until5000.dpr */; };
+		2C4B70240CF7584500B0F0BD /* ModiSDK.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CF5508B0CDA22B000627463 /* ModiSDK.pas */; };
 		2C4D9C8F0CC9EC8C0031092D /* TextGL.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C620CC9EC8C0031092D /* TextGL.pas */; };
 		2C4D9C900CC9EC8C0031092D /* UAudio_bass.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C630CC9EC8C0031092D /* UAudio_bass.pas */; };
-		2C4D9C910CC9EC8C0031092D /* UAudio_FFMpeg.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C640CC9EC8C0031092D /* UAudio_FFMpeg.pas */; };
 		2C4D9C920CC9EC8C0031092D /* UCatCovers.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C650CC9EC8C0031092D /* UCatCovers.pas */; };
 		2C4D9C930CC9EC8C0031092D /* UCommandLine.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C660CC9EC8C0031092D /* UCommandLine.pas */; };
 		2C4D9C940CC9EC8C0031092D /* UCommon.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C670CC9EC8C0031092D /* UCommon.pas */; };
@@ -52,7 +53,6 @@
 		2C4D9CBB0CC9EC8C0031092D /* UVideo.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C8E0CC9EC8C0031092D /* UVideo.pas */; };
 		2C4D9CBC0CC9EC8C0031092D /* TextGL.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C620CC9EC8C0031092D /* TextGL.pas */; };
 		2C4D9CBD0CC9EC8C0031092D /* UAudio_bass.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C630CC9EC8C0031092D /* UAudio_bass.pas */; };
-		2C4D9CBE0CC9EC8C0031092D /* UAudio_FFMpeg.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C640CC9EC8C0031092D /* UAudio_FFMpeg.pas */; };
 		2C4D9CBF0CC9EC8C0031092D /* UCatCovers.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C650CC9EC8C0031092D /* UCatCovers.pas */; };
 		2C4D9CC00CC9EC8C0031092D /* UCommandLine.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C660CC9EC8C0031092D /* UCommandLine.pas */; };
 		2C4D9CC10CC9EC8C0031092D /* UCommon.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C670CC9EC8C0031092D /* UCommon.pas */; };
@@ -126,9 +126,7 @@
 		2C4D9DED0CC9EF0A0031092D /* sdl_image.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9DEC0CC9EF0A0031092D /* sdl_image.pas */; };
 		2C4D9DEE0CC9EF0A0031092D /* sdl_image.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9DEC0CC9EF0A0031092D /* sdl_image.pas */; };
 		2C4D9DF10CC9EF210031092D /* sdl_ttf.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9DEF0CC9EF210031092D /* sdl_ttf.pas */; };
-		2C4D9DF20CC9EF210031092D /* sdltruetypefont.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9DF00CC9EF210031092D /* sdltruetypefont.pas */; };
 		2C4D9DF30CC9EF210031092D /* sdl_ttf.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9DEF0CC9EF210031092D /* sdl_ttf.pas */; };
-		2C4D9DF40CC9EF210031092D /* sdltruetypefont.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9DF00CC9EF210031092D /* sdltruetypefont.pas */; };
 		2C4D9E100CC9EF840031092D /* OpenGL12.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9E040CC9EF840031092D /* OpenGL12.pas */; };
 		2C4D9E150CC9EF840031092D /* Windows.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9E090CC9EF840031092D /* Windows.pas */; };
 		2C4D9E1C0CC9EF840031092D /* OpenGL12.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9E040CC9EF840031092D /* OpenGL12.pas */; };
@@ -136,6 +134,9 @@
 		2C4D9E450CC9F0ED0031092D /* switches.inc in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9E440CC9F0ED0031092D /* switches.inc */; };
 		2C4D9E460CC9F0ED0031092D /* switches.inc in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9E440CC9F0ED0031092D /* switches.inc */; };
 		2C4FA2A80CDBAD1E002CC3B0 /* ustar-icon_v01.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2C4FA2A70CDBAD1E002CC3B0 /* ustar-icon_v01.icns */; };
+		2C5663EF0D35645700D4FF53 /* portaudio.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C5663EE0D35645700D4FF53 /* portaudio.pas */; };
+		2C5663F00D35645700D4FF53 /* portaudio.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C5663EE0D35645700D4FF53 /* portaudio.pas */; };
+		2C56642C0D35683200D4FF53 /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C56642B0D35683200D4FF53 /* SDLMain.m */; };
 		2C89372A0CE393FB005D8A87 /* UPlatform.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C8937290CE393FB005D8A87 /* UPlatform.pas */; };
 		2C89372B0CE393FB005D8A87 /* UPlatform.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C8937290CE393FB005D8A87 /* UPlatform.pas */; };
 		2C8937340CE395CE005D8A87 /* UPlatformMacOSX.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */; };
@@ -147,6 +148,12 @@
 		2CDD4BE20CB947BE00549FAC /* UltraStarDX.pas in Sources */ = {isa = PBXBuildFile; fileRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */; };
 		2CDEA4F70CBD725B0096994C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CDEA4F60CBD725B0096994C /* OpenGL.framework */; };
 		2CDEC4960CC5264600FFA244 /* SDL.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 98B8BE570B1F972400162019 /* SDL.framework */; };
+		2CE907930D1BC8A800A1FDFF /* libavcodec.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CE907900D1BC8A800A1FDFF /* libavcodec.dylib */; };
+		2CE907940D1BC8A800A1FDFF /* libavformat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CE907910D1BC8A800A1FDFF /* libavformat.dylib */; };
+		2CE907950D1BC8A800A1FDFF /* libavutil.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CE907920D1BC8A800A1FDFF /* libavutil.dylib */; };
+		2CE907980D1BC90A00A1FDFF /* libavcodec.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2CE907900D1BC8A800A1FDFF /* libavcodec.dylib */; };
+		2CE907990D1BC91D00A1FDFF /* libavformat.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2CE907910D1BC8A800A1FDFF /* libavformat.dylib */; };
+		2CE9079A0D1BC91D00A1FDFF /* libavutil.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2CE907920D1BC8A800A1FDFF /* libavutil.dylib */; };
 		2CEA2AE00CE385190097A5FF /* Graphics.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CEA2ADE0CE385190097A5FF /* Graphics.pas */; };
 		2CEA2AE10CE385190097A5FF /* JPEG.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CEA2ADF0CE385190097A5FF /* JPEG.pas */; };
 		2CEA2AE20CE385190097A5FF /* Graphics.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CEA2ADE0CE385190097A5FF /* Graphics.pas */; };
@@ -246,10 +253,6 @@
 		2CF552B30CDA42C900627463 /* avutil.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CF552A10CDA42C900627463 /* avutil.pas */; };
 		2CF552B60CDA42C900627463 /* opt.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CF552A40CDA42C900627463 /* opt.pas */; };
 		2CF552B70CDA42C900627463 /* rational.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CF552A50CDA42C900627463 /* rational.pas */; };
-		2CF552C30CDA4B7B00627463 /* libavcodec.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CF552BF0CDA4B7B00627463 /* libavcodec.dylib */; };
-		2CF552C40CDA4B7B00627463 /* libavformat.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CF552C00CDA4B7B00627463 /* libavformat.dylib */; };
-		2CF552C50CDA4B7B00627463 /* libavutil.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CF552C10CDA4B7B00627463 /* libavutil.dylib */; };
-		2CF552C60CDA4B7B00627463 /* libmp3lame.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CF552C20CDA4B7B00627463 /* libmp3lame.dylib */; };
 		2CF553080CDA51B500627463 /* sdlutils.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CF553070CDA51B500627463 /* sdlutils.pas */; };
 		2CF553090CDA51B500627463 /* sdlutils.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CF553070CDA51B500627463 /* sdlutils.pas */; };
 		2CF553100CDA52D100627463 /* SDL_image.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2C4D9D980CC9EE0B0031092D /* SDL_image.framework */; };
@@ -257,17 +260,12 @@
 		2CF5533E0CDA530300627463 /* libbass.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2C4D9CE90CC9ECB50031092D /* libbass.dylib */; };
 		2CF5533F0CDA531100627463 /* libfreeimage.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2C4D9D960CC9EDEB0031092D /* libfreeimage.dylib */; };
 		2CF553400CDA531100627463 /* libsqlite3.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2CF5512C0CDA29C600627463 /* libsqlite3.dylib */; };
-		2CF553410CDA531100627463 /* libavcodec.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2CF552BF0CDA4B7B00627463 /* libavcodec.dylib */; };
-		2CF553420CDA531100627463 /* libavformat.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2CF552C00CDA4B7B00627463 /* libavformat.dylib */; };
-		2CF553430CDA531100627463 /* libavutil.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2CF552C10CDA4B7B00627463 /* libavutil.dylib */; };
-		2CF553440CDA531100627463 /* libmp3lame.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2CF552C20CDA4B7B00627463 /* libmp3lame.dylib */; };
 		2CF8E6BE0CDFA8E80053A996 /* UPartyDefs.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CF8E6BD0CDFA8E80053A996 /* UPartyDefs.pas */; };
 		2CF8E6BF0CDFA8E80053A996 /* UPartyDefs.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CF8E6BD0CDFA8E80053A996 /* UPartyDefs.pas */; };
 		98B8BE340B1F947800162019 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 98B8BE330B1F947800162019 /* AppKit.framework */; };
 		98B8BE390B1F949C00162019 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 98B8BE370B1F949C00162019 /* Cocoa.framework */; };
 		98B8BE3A0B1F949C00162019 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 98B8BE380B1F949C00162019 /* Foundation.framework */; };
 		98B8BE580B1F972400162019 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 98B8BE570B1F972400162019 /* SDL.framework */; };
-		98B8BE760B1F97F800162019 /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 98B8BE750B1F97F800162019 /* SDLMain.m */; };
 		DD37F23D0A60252800975B2D /* UltraStarDX.pas in Sources */ = {isa = PBXBuildFile; fileRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */; };
 		DD37F2C70A6037EA00975B2D /* libfpcrtl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD37F2430A60255800975B2D /* libfpcrtl.a */; };
 		DDC689B509F57C69004E4BFF /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DDC689B309F57C69004E4BFF /* InfoPlist.strings */; };
@@ -342,12 +340,11 @@
 			dstPath = "";
 			dstSubfolderSpec = 6;
 			files = (
+				2CE907990D1BC91D00A1FDFF /* libavformat.dylib in CopyFiles */,
+				2CE9079A0D1BC91D00A1FDFF /* libavutil.dylib in CopyFiles */,
+				2CE907980D1BC90A00A1FDFF /* libavcodec.dylib in CopyFiles */,
 				2CF5533F0CDA531100627463 /* libfreeimage.dylib in CopyFiles */,
 				2CF553400CDA531100627463 /* libsqlite3.dylib in CopyFiles */,
-				2CF553410CDA531100627463 /* libavcodec.dylib in CopyFiles */,
-				2CF553420CDA531100627463 /* libavformat.dylib in CopyFiles */,
-				2CF553430CDA531100627463 /* libavutil.dylib in CopyFiles */,
-				2CF553440CDA531100627463 /* libmp3lame.dylib in CopyFiles */,
 				2CF5533E0CDA530300627463 /* libbass.dylib in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -367,9 +364,9 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		2C4B70220CF757A400B0F0BD /* Until5000.dpr */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = Until5000.dpr; path = ../../../Modis/5000Points/Until5000.dpr; sourceTree = SOURCE_ROOT; };
 		2C4D9C620CC9EC8C0031092D /* TextGL.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = TextGL.pas; path = ../Classes/TextGL.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		2C4D9C630CC9EC8C0031092D /* UAudio_bass.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = UAudio_bass.pas; path = ../Classes/UAudio_bass.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
-		2C4D9C640CC9EC8C0031092D /* UAudio_FFMpeg.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = UAudio_FFMpeg.pas; path = ../Classes/UAudio_FFMpeg.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		2C4D9C650CC9EC8C0031092D /* UCatCovers.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = UCatCovers.pas; path = ../Classes/UCatCovers.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		2C4D9C660CC9EC8C0031092D /* UCommandLine.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = UCommandLine.pas; path = ../Classes/UCommandLine.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		2C4D9C670CC9EC8C0031092D /* UCommon.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = UCommon.pas; path = ../Classes/UCommon.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
@@ -429,15 +426,20 @@
 		2C4D9DD50CC9EE6F0031092D /* UMenuText.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = UMenuText.pas; path = ../Menu/UMenuText.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		2C4D9DEC0CC9EF0A0031092D /* sdl_image.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = sdl_image.pas; path = "/Library/Frameworks/JEDI-SDL.framework/SDL_image/sdl_image.pas"; sourceTree = "<absolute>"; tabWidth = 2; };
 		2C4D9DEF0CC9EF210031092D /* sdl_ttf.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = sdl_ttf.pas; path = "/Library/Frameworks/JEDI-SDL.framework/SDL_ttf/sdl_ttf.pas"; sourceTree = "<absolute>"; tabWidth = 2; };
-		2C4D9DF00CC9EF210031092D /* sdltruetypefont.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = sdltruetypefont.pas; path = "/Library/Frameworks/JEDI-SDL.framework/SDL_ttf/sdltruetypefont.pas"; sourceTree = "<absolute>"; tabWidth = 2; };
 		2C4D9E040CC9EF840031092D /* OpenGL12.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = OpenGL12.pas; path = Wrapper/OpenGL12.pas; sourceTree = "<group>"; tabWidth = 2; };
 		2C4D9E090CC9EF840031092D /* Windows.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = Windows.pas; path = Wrapper/Windows.pas; sourceTree = "<group>"; tabWidth = 2; };
 		2C4D9E440CC9F0ED0031092D /* switches.inc */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = switches.inc; path = ../switches.inc; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		2C4FA2A70CDBAD1E002CC3B0 /* ustar-icon_v01.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = "ustar-icon_v01.icns"; path = "../../Graphics/ustar-icon_v01.icns"; sourceTree = SOURCE_ROOT; };
+		2C5663EE0D35645700D4FF53 /* portaudio.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = portaudio.pas; path = ../lib/portaudio/delphi/portaudio.pas; sourceTree = SOURCE_ROOT; };
+		2C56642B0D35683200D4FF53 /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; name = SDLMain.m; path = "/Library/Frameworks/JEDI-SDL.framework/SDL/SDLMain.m"; sourceTree = "<absolute>"; };
+		2C56642F0D35688200D4FF53 /* SDL.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = SDL.h; path = /Library/Frameworks/SDL.framework/Versions/A/Headers/SDL.h; sourceTree = "<absolute>"; };
 		2C8937290CE393FB005D8A87 /* UPlatform.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = UPlatform.pas; path = ../Classes/UPlatform.pas; sourceTree = SOURCE_ROOT; };
 		2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; lineEnding = 0; name = UPlatformMacOSX.pas; path = ../Classes/UPlatformMacOSX.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		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; };
+		2CE907910D1BC8A800A1FDFF /* libavformat.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavformat.dylib; path = ../lib/ffmpeg/libavformat.dylib; sourceTree = SOURCE_ROOT; };
+		2CE907920D1BC8A800A1FDFF /* libavutil.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavutil.dylib; path = ../lib/ffmpeg/libavutil.dylib; sourceTree = SOURCE_ROOT; };
 		2CEA2ADE0CE385190097A5FF /* Graphics.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = Graphics.pas; path = Wrapper/Graphics.pas; sourceTree = "<group>"; };
 		2CEA2ADF0CE385190097A5FF /* JPEG.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = JPEG.pas; path = Wrapper/JPEG.pas; sourceTree = "<group>"; };
 		2CEA2AF00CE3868E0097A5FF /* PseudoThread.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = PseudoThread.pas; path = Wrapper/PseudoThread.pas; sourceTree = "<group>"; };
@@ -489,19 +491,14 @@
 		2CF552A10CDA42C900627463 /* avutil.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = avutil.pas; path = ../lib/ffmpeg/avutil.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		2CF552A40CDA42C900627463 /* opt.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = opt.pas; path = ../lib/ffmpeg/opt.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		2CF552A50CDA42C900627463 /* rational.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = rational.pas; path = ../lib/ffmpeg/rational.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
-		2CF552BF0CDA4B7B00627463 /* libavcodec.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavcodec.dylib; path = ../lib/ffmpeg/libavcodec.dylib; sourceTree = SOURCE_ROOT; };
-		2CF552C00CDA4B7B00627463 /* libavformat.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavformat.dylib; path = ../lib/ffmpeg/libavformat.dylib; sourceTree = SOURCE_ROOT; };
-		2CF552C10CDA4B7B00627463 /* libavutil.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavutil.dylib; path = ../lib/ffmpeg/libavutil.dylib; sourceTree = SOURCE_ROOT; };
-		2CF552C20CDA4B7B00627463 /* libmp3lame.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmp3lame.dylib; path = ../lib/ffmpeg/libmp3lame.dylib; sourceTree = SOURCE_ROOT; };
 		2CF553070CDA51B500627463 /* sdlutils.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = sdlutils.pas; path = "/Library/Frameworks/JEDI-SDL.framework/SDL/sdlutils.pas"; sourceTree = "<absolute>"; tabWidth = 2; };
+		2CF77DB60CF7556C00F3B101 /* libUntil5000.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libUntil5000.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		2CF8E6BD0CDFA8E80053A996 /* UPartyDefs.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = UPartyDefs.pas; path = ../../../Modis/SDK/UPartyDefs.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
-		9845B6590B1F9B9E0084DD62 /* SDL.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL.h; path = /Library/Frameworks/SDL.framework/Versions/A/Headers/SDL.h; sourceTree = "<absolute>"; };
 		98B8BE330B1F947800162019 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		98B8BE370B1F949C00162019 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		98B8BE380B1F949C00162019 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		98B8BE570B1F972400162019 /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = /Library/Frameworks/SDL.framework; sourceTree = "<absolute>"; };
 		98B8BE5C0B1F974F00162019 /* sdl.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = sdl.pas; path = "/Library/Frameworks/JEDI-SDL.framework/SDL/sdl.pas"; sourceTree = "<absolute>"; tabWidth = 2; };
-		98B8BE750B1F97F800162019 /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SDLMain.m; path = "/Library/Frameworks/JEDI-SDL.framework/SDL/SDLMain.m"; sourceTree = "<absolute>"; };
 		DD37F2430A60255800975B2D /* libfpcrtl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libfpcrtl.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		DDC6851B09F57195004E4BFF /* UltraStarDX.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; path = UltraStarDX.pas; sourceTree = "<group>"; tabWidth = 2; };
 		DDC6868B09F571C2004E4BFF /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 12; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -512,6 +509,13 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		2CF77DB40CF7556C00F3B101 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		DDC688C609F574E9004E4BFF /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -527,10 +531,9 @@
 				2C4D9D9A0CC9EE0B0031092D /* SDL_image.framework in Frameworks */,
 				2C4D9D9B0CC9EE0B0031092D /* SDL_ttf.framework in Frameworks */,
 				2CF5512D0CDA29C600627463 /* libsqlite3.dylib in Frameworks */,
-				2CF552C30CDA4B7B00627463 /* libavcodec.dylib in Frameworks */,
-				2CF552C40CDA4B7B00627463 /* libavformat.dylib in Frameworks */,
-				2CF552C50CDA4B7B00627463 /* libavutil.dylib in Frameworks */,
-				2CF552C60CDA4B7B00627463 /* libmp3lame.dylib in Frameworks */,
+				2CE907930D1BC8A800A1FDFF /* libavcodec.dylib in Frameworks */,
+				2CE907940D1BC8A800A1FDFF /* libavformat.dylib in Frameworks */,
+				2CE907950D1BC8A800A1FDFF /* libavutil.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -540,12 +543,11 @@
 		2C4D9DEB0CC9EECC0031092D /* SDL */ = {
 			isa = PBXGroup;
 			children = (
+				2C56642F0D35688200D4FF53 /* SDL.h */,
+				2C56642B0D35683200D4FF53 /* SDLMain.m */,
 				2CF553070CDA51B500627463 /* sdlutils.pas */,
 				2C4D9DEF0CC9EF210031092D /* sdl_ttf.pas */,
-				2C4D9DF00CC9EF210031092D /* sdltruetypefont.pas */,
 				2C4D9DEC0CC9EF0A0031092D /* sdl_image.pas */,
-				9845B6590B1F9B9E0084DD62 /* SDL.h */,
-				98B8BE750B1F97F800162019 /* SDLMain.m */,
 				98B8BE5C0B1F974F00162019 /* sdl.pas */,
 			);
 			name = SDL;
@@ -565,6 +567,14 @@
 			name = Wrapper;
 			sourceTree = "<group>";
 		};
+		2C5663EC0D35642E00D4FF53 /* portaudio */ = {
+			isa = PBXGroup;
+			children = (
+				2C5663EE0D35645700D4FF53 /* portaudio.pas */,
+			);
+			name = portaudio;
+			sourceTree = "<group>";
+		};
 		2CDD43820CBBE8D400F364DE /* Classes */ = {
 			isa = PBXGroup;
 			children = (
@@ -572,7 +582,6 @@
 				2C8937290CE393FB005D8A87 /* UPlatform.pas */,
 				2C4D9C620CC9EC8C0031092D /* TextGL.pas */,
 				2C4D9C630CC9EC8C0031092D /* UAudio_bass.pas */,
-				2C4D9C640CC9EC8C0031092D /* UAudio_FFMpeg.pas */,
 				2C4D9C650CC9EC8C0031092D /* UCatCovers.pas */,
 				2C4D9C660CC9EC8C0031092D /* UCommandLine.pas */,
 				2C4D9C670CC9EC8C0031092D /* UCommon.pas */,
@@ -714,6 +723,7 @@
 			isa = PBXGroup;
 			children = (
 				2CE8C7CE0CBAA47D00E4D835 /* BASS */,
+				2C5663EC0D35642E00D4FF53 /* portaudio */,
 				2CF5529C0CDA428000627463 /* ffmpeg */,
 				2CE1F4080CC3EEA400CD02E5 /* FreeImage */,
 				2C4D9DEB0CC9EECC0031092D /* SDL */,
@@ -744,6 +754,14 @@
 			name = ffmpeg;
 			sourceTree = "<group>";
 		};
+		2CF77DBA0CF755CA00F3B101 /* Modis */ = {
+			isa = PBXGroup;
+			children = (
+				2C4B70220CF757A400B0F0BD /* Until5000.dpr */,
+			);
+			name = Modis;
+			sourceTree = "<group>";
+		};
 		DD7C45450A6E72DE003FA52B /* Source */ = {
 			isa = PBXGroup;
 			children = (
@@ -753,6 +771,7 @@
 				2CDD438D0CBBE8F700F364DE /* Menu */,
 				2CF5508A0CDA228800627463 /* SDK */,
 				2C4D9DF50CC9EF3A0031092D /* Wrapper */,
+				2CF77DBA0CF755CA00F3B101 /* Modis */,
 				DDC6851B09F57195004E4BFF /* UltraStarDX.pas */,
 				2CF551A70CDA356800627463 /* UltraStar.dpr */,
 				2C4D9E440CC9F0ED0031092D /* switches.inc */,
@@ -763,6 +782,9 @@
 		DDC6850D09F5717A004E4BFF = {
 			isa = PBXGroup;
 			children = (
+				2CE907900D1BC8A800A1FDFF /* libavcodec.dylib */,
+				2CE907910D1BC8A800A1FDFF /* libavformat.dylib */,
+				2CE907920D1BC8A800A1FDFF /* libavutil.dylib */,
 				98B8BE570B1F972400162019 /* SDL.framework */,
 				2C4D9D980CC9EE0B0031092D /* SDL_image.framework */,
 				2C4D9D990CC9EE0B0031092D /* SDL_ttf.framework */,
@@ -773,10 +795,6 @@
 				2C4D9CE90CC9ECB50031092D /* libbass.dylib */,
 				2C4D9D960CC9EDEB0031092D /* libfreeimage.dylib */,
 				2CF5512C0CDA29C600627463 /* libsqlite3.dylib */,
-				2CF552BF0CDA4B7B00627463 /* libavcodec.dylib */,
-				2CF552C00CDA4B7B00627463 /* libavformat.dylib */,
-				2CF552C10CDA4B7B00627463 /* libavutil.dylib */,
-				2CF552C20CDA4B7B00627463 /* libmp3lame.dylib */,
 				DD7C45450A6E72DE003FA52B /* Source */,
 				DDC6868A09F571C2004E4BFF /* Resources */,
 				2CDD8D0B0CC5539900E4169D /* UltraStarDX Resources */,
@@ -802,13 +820,41 @@
 			children = (
 				DDC688C809F574E9004E4BFF /* UltraStarDX.app */,
 				DD37F2430A60255800975B2D /* libfpcrtl.a */,
+				2CF77DB60CF7556C00F3B101 /* libUntil5000.dylib */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
+/* Begin PBXHeadersBuildPhase section */
+		2CF77DB20CF7556C00F3B101 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
 /* Begin PBXNativeTarget section */
+		2CF77DB50CF7556C00F3B101 /* Modi_Until5000 */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 2CF77DB90CF7558B00F3B101 /* Build configuration list for PBXNativeTarget "Modi_Until5000" */;
+			buildPhases = (
+				2CF77DB20CF7556C00F3B101 /* Headers */,
+				2CF77DB30CF7556C00F3B101 /* Sources */,
+				2CF77DB40CF7556C00F3B101 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = Modi_Until5000;
+			productName = Lib_UltraPong;
+			productReference = 2CF77DB60CF7556C00F3B101 /* libUntil5000.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
 		DD37F2420A60255800975B2D /* fpcrtl */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = DD37F2560A60258300975B2D /* Build configuration list for PBXNativeTarget "fpcrtl" */;
@@ -885,6 +931,7 @@
 				DDC688C709F574E9004E4BFF /* UltraStarDX */,
 				DDC688D409F57523004E4BFF /* Put all program sources also in this target */,
 				DD37F2420A60255800975B2D /* fpcrtl */,
+				2CF77DB50CF7556C00F3B101 /* Modi_Until5000 */,
 			);
 		};
 /* End PBXProject section */
@@ -972,16 +1019,23 @@
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+		2CF77DB30CF7556C00F3B101 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2C4B70240CF7584500B0F0BD /* ModiSDK.pas in Sources */,
+				2C4B70230CF7581000B0F0BD /* Until5000.dpr in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		DDC688C509F574E9004E4BFF /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				2CDD4BE20CB947BE00549FAC /* UltraStarDX.pas in Sources */,
 				2CDD4BE00CB947B100549FAC /* sdl.pas in Sources */,
-				98B8BE760B1F97F800162019 /* SDLMain.m in Sources */,
 				2C4D9C8F0CC9EC8C0031092D /* TextGL.pas in Sources */,
 				2C4D9C900CC9EC8C0031092D /* UAudio_bass.pas in Sources */,
-				2C4D9C910CC9EC8C0031092D /* UAudio_FFMpeg.pas in Sources */,
 				2C4D9C920CC9EC8C0031092D /* UCatCovers.pas in Sources */,
 				2C4D9C930CC9EC8C0031092D /* UCommandLine.pas in Sources */,
 				2C4D9C940CC9EC8C0031092D /* UCommon.pas in Sources */,
@@ -1037,7 +1091,6 @@
 				2C4D9DDF0CC9EE6F0031092D /* UMenuText.pas in Sources */,
 				2C4D9DED0CC9EF0A0031092D /* sdl_image.pas in Sources */,
 				2C4D9DF10CC9EF210031092D /* sdl_ttf.pas in Sources */,
-				2C4D9DF20CC9EF210031092D /* sdltruetypefont.pas in Sources */,
 				2C4D9E100CC9EF840031092D /* OpenGL12.pas in Sources */,
 				2C4D9E150CC9EF840031092D /* Windows.pas in Sources */,
 				2C4D9E450CC9F0ED0031092D /* switches.inc in Sources */,
@@ -1095,6 +1148,8 @@
 				2CEA2AF10CE3868E0097A5FF /* PseudoThread.pas in Sources */,
 				2C89372A0CE393FB005D8A87 /* UPlatform.pas in Sources */,
 				2C8937340CE395CE005D8A87 /* UPlatformMacOSX.pas in Sources */,
+				2C5663EF0D35645700D4FF53 /* portaudio.pas in Sources */,
+				2C56642C0D35683200D4FF53 /* SDLMain.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1106,7 +1161,6 @@
 				DD37F23D0A60252800975B2D /* UltraStarDX.pas in Sources */,
 				2C4D9CBC0CC9EC8C0031092D /* TextGL.pas in Sources */,
 				2C4D9CBD0CC9EC8C0031092D /* UAudio_bass.pas in Sources */,
-				2C4D9CBE0CC9EC8C0031092D /* UAudio_FFMpeg.pas in Sources */,
 				2C4D9CBF0CC9EC8C0031092D /* UCatCovers.pas in Sources */,
 				2C4D9CC00CC9EC8C0031092D /* UCommandLine.pas in Sources */,
 				2C4D9CC10CC9EC8C0031092D /* UCommon.pas in Sources */,
@@ -1162,7 +1216,6 @@
 				2C4D9DE90CC9EE6F0031092D /* UMenuText.pas in Sources */,
 				2C4D9DEE0CC9EF0A0031092D /* sdl_image.pas in Sources */,
 				2C4D9DF30CC9EF210031092D /* sdl_ttf.pas in Sources */,
-				2C4D9DF40CC9EF210031092D /* sdltruetypefont.pas in Sources */,
 				2C4D9E1C0CC9EF840031092D /* OpenGL12.pas in Sources */,
 				2C4D9E210CC9EF840031092D /* Windows.pas in Sources */,
 				2C4D9E460CC9F0ED0031092D /* switches.inc in Sources */,
@@ -1220,6 +1273,7 @@
 				2CEA2AF20CE3868E0097A5FF /* PseudoThread.pas in Sources */,
 				2C89372B0CE393FB005D8A87 /* UPlatform.pas in Sources */,
 				2C8937370CE395CE005D8A87 /* UPlatformMacOSX.pas in Sources */,
+				2C5663F00D35645700D4FF53 /* portaudio.pas in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1239,6 +1293,38 @@
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
+		2CF77DB70CF7556D00F3B101 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = lib;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				INSTALL_PATH = /usr/local/lib;
+				LD_DYLIB_INSTALL_NAME = "@executable_path/libUntil5000.dylib";
+				PREBINDING = NO;
+				PRODUCT_NAME = Until5000;
+				ZERO_LINK = YES;
+			};
+			name = Debug;
+		};
+		2CF77DB80CF7556D00F3B101 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				EXECUTABLE_PREFIX = lib;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_MODEL_TUNING = G5;
+				INSTALL_PATH = /usr/local/lib;
+				PREBINDING = NO;
+				PRODUCT_NAME = Lib_UltraPong;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
 		DD37F2570A60258300975B2D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -1328,12 +1414,14 @@
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_6)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_3)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 				);
 				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Debug\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../lib/SQLite\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/../lib/ffmpeg\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_5 = "\"$(SRCROOT)/../lib/bass\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_6 = "\"$(SRCROOT)/../lib/FreeImage\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../lib/ffmpeg\"";
 				LINK_WITH_STANDARD_LIBRARIES = YES;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -1372,6 +1460,7 @@
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_6)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_7)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_8)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_9)",
 				);
 				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Debug\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/Bass\"";
@@ -1381,6 +1470,7 @@
 				LIBRARY_SEARCH_PATHS_QUOTED_6 = "\"$(SRCROOT)/../lib/FreeImage\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_7 = "\"$(SRCROOT)/../lib/SQLite\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_8 = "\"$(SRCROOT)/../lib/ffmpeg\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_9 = "\"$(SRCROOT)/../lib/ffmpeg\"";
 				LINK_WITH_STANDARD_LIBRARIES = YES;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -1436,6 +1526,15 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		2CF77DB90CF7558B00F3B101 /* Build configuration list for PBXNativeTarget "Modi_Until5000" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				2CF77DB70CF7556D00F3B101 /* Debug */,
+				2CF77DB80CF7556D00F3B101 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
+		};
 		DD37F2560A60258300975B2D /* Build configuration list for PBXNativeTarget "fpcrtl" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (