Fixed compiling and typos on OS X.

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

1 files changed, 42 insertions, 32 deletions

diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj b/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
index be2d67d4..fff4e14b 100644
--- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
+++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
 		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 */; };
 		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 +51,6 @@
 		2C4D9CBA0CC9EC8C0031092D /* UTime.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C8D0CC9EC8C0031092D /* UTime.pas */; };
 		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 */; };
 		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 */; };
@@ -93,9 +91,6 @@
 		2C4D9CE60CC9EC8C0031092D /* UThemes.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C8C0CC9EC8C0031092D /* UThemes.pas */; };
 		2C4D9CE70CC9EC8C0031092D /* UTime.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C8D0CC9EC8C0031092D /* UTime.pas */; };
 		2C4D9CE80CC9EC8C0031092D /* UVideo.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9C8E0CC9EC8C0031092D /* UVideo.pas */; };
-		2C4D9CEA0CC9ECB50031092D /* libbass.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C4D9CE90CC9ECB50031092D /* libbass.dylib */; };
-		2C4D9D8E0CC9ED230031092D /* Bass.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9D8D0CC9ED230031092D /* Bass.pas */; };
-		2C4D9D8F0CC9ED230031092D /* Bass.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9D8D0CC9ED230031092D /* Bass.pas */; };
 		2C4D9D920CC9ED4F0031092D /* FreeBitmap.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9D900CC9ED4F0031092D /* FreeBitmap.pas */; };
 		2C4D9D930CC9ED4F0031092D /* FreeImage.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9D910CC9ED4F0031092D /* FreeImage.pas */; };
 		2C4D9D940CC9ED4F0031092D /* FreeBitmap.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D9D900CC9ED4F0031092D /* FreeBitmap.pas */; };
@@ -141,6 +136,14 @@
 		2C89372B0CE393FB005D8A87 /* UPlatform.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C8937290CE393FB005D8A87 /* UPlatform.pas */; };
 		2C8937340CE395CE005D8A87 /* UPlatformMacOSX.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */; };
 		2C8937370CE395CE005D8A87 /* UPlatformMacOSX.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */; };
+		2CAC2BE20D3809F500CA518A /* UAudioInput_Bass.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CAC2BDD0D3809F500CA518A /* UAudioInput_Bass.pas */; };
+		2CAC2BE40D3809F500CA518A /* UAudioPlayback_Bass.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CAC2BDF0D3809F500CA518A /* UAudioPlayback_Bass.pas */; };
+		2CAC2BE70D3809F500CA518A /* UAudioInput_Bass.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CAC2BDD0D3809F500CA518A /* UAudioInput_Bass.pas */; };
+		2CAC2BE90D3809F500CA518A /* UAudioPlayback_Bass.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CAC2BDF0D3809F500CA518A /* UAudioPlayback_Bass.pas */; };
+		2CAC2BF10D380AC200CA518A /* libbass.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CAC2BF00D380AC200CA518A /* libbass.dylib */; };
+		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 */; };
 		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 */; };
@@ -257,7 +260,6 @@
 		2CF553090CDA51B500627463 /* sdlutils.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CF553070CDA51B500627463 /* sdlutils.pas */; };
 		2CF553100CDA52D100627463 /* SDL_image.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2C4D9D980CC9EE0B0031092D /* SDL_image.framework */; };
 		2CF5533B0CDA52E200627463 /* SDL_ttf.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2C4D9D990CC9EE0B0031092D /* SDL_ttf.framework */; };
-		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 */; };
 		2CF8E6BE0CDFA8E80053A996 /* UPartyDefs.pas in Sources */ = {isa = PBXBuildFile; fileRef = 2CF8E6BD0CDFA8E80053A996 /* UPartyDefs.pas */; };
@@ -340,12 +342,12 @@
 			dstPath = "";
 			dstSubfolderSpec = 6;
 			files = (
+				2CAC2BF40D380AE800CA518A /* libbass.dylib in CopyFiles */,
 				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 */,
-				2CF5533E0CDA530300627463 /* libbass.dylib in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -366,7 +368,6 @@
 /* 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; };
 		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; };
@@ -407,8 +408,6 @@
 		2C4D9C8C0CC9EC8C0031092D /* UThemes.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = UThemes.pas; path = ../Classes/UThemes.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		2C4D9C8D0CC9EC8C0031092D /* UTime.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = UTime.pas; path = ../Classes/UTime.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		2C4D9C8E0CC9EC8C0031092D /* UVideo.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = UVideo.pas; path = ../Classes/UVideo.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
-		2C4D9CE90CC9ECB50031092D /* libbass.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbass.dylib; path = ../lib/bass/libbass.dylib; sourceTree = SOURCE_ROOT; };
-		2C4D9D8D0CC9ED230031092D /* Bass.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = Bass.pas; path = ../lib/bass/MacOSX/Bass.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		2C4D9D900CC9ED4F0031092D /* FreeBitmap.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = FreeBitmap.pas; path = ../lib/FreeImage/FreeBitmap.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		2C4D9D910CC9ED4F0031092D /* FreeImage.pas */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.pascal; name = FreeImage.pas; path = ../lib/FreeImage/FreeImage.pas; sourceTree = SOURCE_ROOT; tabWidth = 2; };
 		2C4D9D960CC9EDEB0031092D /* libfreeimage.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfreeimage.dylib; path = ../lib/FreeImage/libfreeimage.dylib; sourceTree = SOURCE_ROOT; };
@@ -435,6 +434,10 @@
 		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; };
+		2CAC2BDD0D3809F500CA518A /* UAudioInput_Bass.pas */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.pascal; name = UAudioInput_Bass.pas; path = ../Classes/UAudioInput_Bass.pas; sourceTree = SOURCE_ROOT; };
+		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; };
 		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; };
@@ -492,7 +495,7 @@
 		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; };
 		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; };
+		2CF77DB60CF7556C00F3B101 /* libLib_UltraPong.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libLib_UltraPong.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; };
 		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>"; };
@@ -502,7 +505,7 @@
 		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>"; };
-		DDC688C809F574E9004E4BFF /* UltraStarDX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UltraStarDX.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		DDC688C809F574E9004E4BFF /* UltraStar Deluxe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "UltraStar Deluxe.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		DDC688CA09F574E9004E4BFF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
 		DDC689B309F57C69004E4BFF /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = InfoPlist.strings; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		DDC689B409F57C69004E4BFF /* SDLMain.nib */ = {isa = PBXFileReference; explicitFileType = wrapper.nib; name = SDLMain.nib; path = English.lproj/SDLMain.nib; sourceTree = "<group>"; };
@@ -526,7 +529,6 @@
 				98B8BE3A0B1F949C00162019 /* Foundation.framework in Frameworks */,
 				98B8BE580B1F972400162019 /* SDL.framework in Frameworks */,
 				2CDEA4F70CBD725B0096994C /* OpenGL.framework in Frameworks */,
-				2C4D9CEA0CC9ECB50031092D /* libbass.dylib in Frameworks */,
 				2C4D9D970CC9EDEB0031092D /* libfreeimage.dylib in Frameworks */,
 				2C4D9D9A0CC9EE0B0031092D /* SDL_image.framework in Frameworks */,
 				2C4D9D9B0CC9EE0B0031092D /* SDL_ttf.framework in Frameworks */,
@@ -534,6 +536,7 @@
 				2CE907930D1BC8A800A1FDFF /* libavcodec.dylib in Frameworks */,
 				2CE907940D1BC8A800A1FDFF /* libavformat.dylib in Frameworks */,
 				2CE907950D1BC8A800A1FDFF /* libavutil.dylib in Frameworks */,
+				2CAC2BF10D380AC200CA518A /* libbass.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -575,13 +578,22 @@
 			name = portaudio;
 			sourceTree = "<group>";
 		};
+		2CAC2BF60D380B0800CA518A /* BASS */ = {
+			isa = PBXGroup;
+			children = (
+				2CAC2BF70D380B1B00CA518A /* Bass.pas */,
+			);
+			name = BASS;
+			sourceTree = "<group>";
+		};
 		2CDD43820CBBE8D400F364DE /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				2CAC2BDD0D3809F500CA518A /* UAudioInput_Bass.pas */,
+				2CAC2BDF0D3809F500CA518A /* UAudioPlayback_Bass.pas */,
 				2C8937310CE395CE005D8A87 /* UPlatformMacOSX.pas */,
 				2C8937290CE393FB005D8A87 /* UPlatform.pas */,
 				2C4D9C620CC9EC8C0031092D /* TextGL.pas */,
-				2C4D9C630CC9EC8C0031092D /* UAudio_bass.pas */,
 				2C4D9C650CC9EC8C0031092D /* UCatCovers.pas */,
 				2C4D9C660CC9EC8C0031092D /* UCommandLine.pas */,
 				2C4D9C670CC9EC8C0031092D /* UCommon.pas */,
@@ -659,14 +671,6 @@
 			name = FreeImage;
 			sourceTree = "<group>";
 		};
-		2CE8C7CE0CBAA47D00E4D835 /* BASS */ = {
-			isa = PBXGroup;
-			children = (
-				2C4D9D8D0CC9ED230031092D /* Bass.pas */,
-			);
-			name = BASS;
-			sourceTree = "<group>";
-		};
 		2CF54F420CDA1B0C00627463 /* Screens */ = {
 			isa = PBXGroup;
 			children = (
@@ -722,7 +726,7 @@
 		2CF5510C0CDA28F000627463 /* Lib */ = {
 			isa = PBXGroup;
 			children = (
-				2CE8C7CE0CBAA47D00E4D835 /* BASS */,
+				2CAC2BF60D380B0800CA518A /* BASS */,
 				2C5663EC0D35642E00D4FF53 /* portaudio */,
 				2CF5529C0CDA428000627463 /* ffmpeg */,
 				2CE1F4080CC3EEA400CD02E5 /* FreeImage */,
@@ -782,6 +786,7 @@
 		DDC6850D09F5717A004E4BFF = {
 			isa = PBXGroup;
 			children = (
+				2CAC2BF00D380AC200CA518A /* libbass.dylib */,
 				2CE907900D1BC8A800A1FDFF /* libavcodec.dylib */,
 				2CE907910D1BC8A800A1FDFF /* libavformat.dylib */,
 				2CE907920D1BC8A800A1FDFF /* libavutil.dylib */,
@@ -792,7 +797,6 @@
 				98B8BE370B1F949C00162019 /* Cocoa.framework */,
 				98B8BE380B1F949C00162019 /* Foundation.framework */,
 				98B8BE330B1F947800162019 /* AppKit.framework */,
-				2C4D9CE90CC9ECB50031092D /* libbass.dylib */,
 				2C4D9D960CC9EDEB0031092D /* libfreeimage.dylib */,
 				2CF5512C0CDA29C600627463 /* libsqlite3.dylib */,
 				DD7C45450A6E72DE003FA52B /* Source */,
@@ -818,9 +822,9 @@
 		DDC6888C09F57243004E4BFF /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				DDC688C809F574E9004E4BFF /* UltraStarDX.app */,
+				DDC688C809F574E9004E4BFF /* UltraStar Deluxe.app */,
 				DD37F2430A60255800975B2D /* libfpcrtl.a */,
-				2CF77DB60CF7556C00F3B101 /* libUntil5000.dylib */,
+				2CF77DB60CF7556C00F3B101 /* libLib_UltraPong.dylib */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -852,7 +856,7 @@
 			);
 			name = Modi_Until5000;
 			productName = Lib_UltraPong;
-			productReference = 2CF77DB60CF7556C00F3B101 /* libUntil5000.dylib */;
+			productReference = 2CF77DB60CF7556C00F3B101 /* libLib_UltraPong.dylib */;
 			productType = "com.apple.product-type.library.dynamic";
 		};
 		DD37F2420A60255800975B2D /* fpcrtl */ = {
@@ -894,7 +898,7 @@
 			);
 			name = UltraStarDX;
 			productName = "JEDI-SDLCocoa";
-			productReference = DDC688C809F574E9004E4BFF /* UltraStarDX.app */;
+			productReference = DDC688C809F574E9004E4BFF /* UltraStar Deluxe.app */;
 			productType = "com.apple.product-type.application";
 		};
 		DDC688D409F57523004E4BFF /* Put all program sources also in this target */ = {
@@ -1035,7 +1039,6 @@
 				2CDD4BE20CB947BE00549FAC /* UltraStarDX.pas in Sources */,
 				2CDD4BE00CB947B100549FAC /* sdl.pas in Sources */,
 				2C4D9C8F0CC9EC8C0031092D /* TextGL.pas in Sources */,
-				2C4D9C900CC9EC8C0031092D /* UAudio_bass.pas in Sources */,
 				2C4D9C920CC9EC8C0031092D /* UCatCovers.pas in Sources */,
 				2C4D9C930CC9EC8C0031092D /* UCommandLine.pas in Sources */,
 				2C4D9C940CC9EC8C0031092D /* UCommon.pas in Sources */,
@@ -1076,7 +1079,6 @@
 				2C4D9CB90CC9EC8C0031092D /* UThemes.pas in Sources */,
 				2C4D9CBA0CC9EC8C0031092D /* UTime.pas in Sources */,
 				2C4D9CBB0CC9EC8C0031092D /* UVideo.pas in Sources */,
-				2C4D9D8E0CC9ED230031092D /* Bass.pas in Sources */,
 				2C4D9D920CC9ED4F0031092D /* FreeBitmap.pas in Sources */,
 				2C4D9D930CC9ED4F0031092D /* FreeImage.pas in Sources */,
 				2C4D9DD60CC9EE6F0031092D /* UDisplay.pas in Sources */,
@@ -1150,6 +1152,9 @@
 				2C8937340CE395CE005D8A87 /* UPlatformMacOSX.pas in Sources */,
 				2C5663EF0D35645700D4FF53 /* portaudio.pas in Sources */,
 				2C56642C0D35683200D4FF53 /* SDLMain.m in Sources */,
+				2CAC2BE20D3809F500CA518A /* UAudioInput_Bass.pas in Sources */,
+				2CAC2BE40D3809F500CA518A /* UAudioPlayback_Bass.pas in Sources */,
+				2CAC2BF80D380B1B00CA518A /* Bass.pas in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1160,7 +1165,6 @@
 				2CDD4BDE0CB947A400549FAC /* sdl.pas in Sources */,
 				DD37F23D0A60252800975B2D /* UltraStarDX.pas in Sources */,
 				2C4D9CBC0CC9EC8C0031092D /* TextGL.pas in Sources */,
-				2C4D9CBD0CC9EC8C0031092D /* UAudio_bass.pas in Sources */,
 				2C4D9CBF0CC9EC8C0031092D /* UCatCovers.pas in Sources */,
 				2C4D9CC00CC9EC8C0031092D /* UCommandLine.pas in Sources */,
 				2C4D9CC10CC9EC8C0031092D /* UCommon.pas in Sources */,
@@ -1201,7 +1205,6 @@
 				2C4D9CE60CC9EC8C0031092D /* UThemes.pas in Sources */,
 				2C4D9CE70CC9EC8C0031092D /* UTime.pas in Sources */,
 				2C4D9CE80CC9EC8C0031092D /* UVideo.pas in Sources */,
-				2C4D9D8F0CC9ED230031092D /* Bass.pas in Sources */,
 				2C4D9D940CC9ED4F0031092D /* FreeBitmap.pas in Sources */,
 				2C4D9D950CC9ED4F0031092D /* FreeImage.pas in Sources */,
 				2C4D9DE00CC9EE6F0031092D /* UDisplay.pas in Sources */,
@@ -1274,6 +1277,9 @@
 				2C89372B0CE393FB005D8A87 /* UPlatform.pas in Sources */,
 				2C8937370CE395CE005D8A87 /* UPlatformMacOSX.pas in Sources */,
 				2C5663F00D35645700D4FF53 /* portaudio.pas in Sources */,
+				2CAC2BE70D3809F500CA518A /* UAudioInput_Bass.pas in Sources */,
+				2CAC2BE90D3809F500CA518A /* UAudioPlayback_Bass.pas in Sources */,
+				2CAC2BF90D380B1B00CA518A /* Bass.pas in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1415,6 +1421,7 @@
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_3)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
 				);
 				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Debug\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../lib/SQLite\"";
@@ -1422,6 +1429,7 @@
 				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\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../lib/bass\"";
 				LINK_WITH_STANDARD_LIBRARIES = YES;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -1461,6 +1469,7 @@
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_7)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_8)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_9)",
+					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 				);
 				LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Debug\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/Bass\"";
@@ -1471,6 +1480,7 @@
 				LIBRARY_SEARCH_PATHS_QUOTED_7 = "\"$(SRCROOT)/../lib/SQLite\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_8 = "\"$(SRCROOT)/../lib/ffmpeg\"";
 				LIBRARY_SEARCH_PATHS_QUOTED_9 = "\"$(SRCROOT)/../lib/ffmpeg\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../lib/bass\"";
 				LINK_WITH_STANDARD_LIBRARIES = YES;
 				OTHER_LDFLAGS = (
 					"-framework",