From 79c5b96f49412541efdd51bca62ce5912b864c08 Mon Sep 17 00:00:00 2001 From: eddie-0815 Date: Fri, 11 Jan 2008 20:56:16 +0000 Subject: 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 --- Game/Code/MacOSX/UltraStarDX.pas | 2 +- .../MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 | 221 ++++++++++++++++++--- .../MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser | 181 ++++++++++++----- .../MacOSX/UltraStarDX.xcodeproj/project.pbxproj | 74 ++++--- Game/Code/lib/ffmpeg/version.inc | 2 +- 5 files changed, 365 insertions(+), 115 deletions(-) (limited to 'Game/Code') diff --git a/Game/Code/MacOSX/UltraStarDX.pas b/Game/Code/MacOSX/UltraStarDX.pas index 59a0880f..5e75ccf9 100644 --- a/Game/Code/MacOSX/UltraStarDX.pas +++ b/Game/Code/MacOSX/UltraStarDX.pas @@ -1,6 +1,6 @@ program UltraStarDX; -uses cthreads, UMain, UMedia_dummy, UAudio_bass, USingNotes, UTextClasses, UVideo; +uses cthreads, UMain, UMedia_dummy, UAudioPlayback_Bass, UAudioInput_Bass, USingNotes, UTextClasses, UVideo; begin Main; diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 index 1039e4c9..05251214 100644 --- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 +++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.mode1v3 @@ -196,6 +196,166 @@ OpenEditors + + Content + + PBXProjectModuleGUID + 2CAC2C100D380F1200CA518A + PBXProjectModuleLabel + URecord.pas + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 2CAC2C110D380F1200CA518A + PBXProjectModuleLabel + URecord.pas + _historyCapacity + 0 + bookmark + 2CAC2C120D380F1200CA518A + history + + 2CAC2C0F0D380E8700CA518A + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {797, 748}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 130 129 797 789 0 0 1680 1028 + + + + Content + + PBXProjectModuleGUID + 2CAC2C000D380C5700CA518A + PBXProjectModuleLabel + UAudioInput_Bass.pas + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 2CAC2C010D380C5700CA518A + PBXProjectModuleLabel + UAudioInput_Bass.pas + _historyCapacity + 0 + bookmark + 2CAC2C140D380F1200CA518A + history + + 2CAC2C130D380F1200CA518A + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {874, 786}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 15 196 874 827 0 0 1680 1028 + + + + Content + + PBXProjectModuleGUID + 2C36B5C30D358BF100E8D797 + PBXProjectModuleLabel + UltraStarDX.pas + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 2C36B5C40D358BF100E8D797 + PBXProjectModuleLabel + UltraStarDX.pas + _historyCapacity + 0 + bookmark + 2CAC2C150D380F1200CA518A + history + + 2CAC2C030D380C5700CA518A + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {987, 762}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 311 168 987 803 0 0 1680 1028 + + + + Content + + PBXProjectModuleGUID + 2C36B5750D3585ED00E8D797 + PBXProjectModuleLabel + UScreenSing.pas + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 2C36B5760D3585ED00E8D797 + PBXProjectModuleLabel + UScreenSing.pas + _historyCapacity + 0 + bookmark + 2CAC2C160D380F1200CA518A + history + + 2C36B5E20D358CFB00E8D797 + + + SplitCount + 1 + + StatusBarVisibility + + + Geometry + + Frame + {{0, 20}, {754, 847}} + PBXModuleWindowStatusBarHidden2 + + RubberWindowFrame + 38 134 754 888 0 0 1680 1028 + + Content @@ -214,10 +374,10 @@ _historyCapacity 0 bookmark - 2C07C94F0D3582C9002A4079 + 2CAC2C170D380F1200CA518A history - 2C5A59420D35813800DCBB8F + 2C36B5E30D358CFB00E8D797 SplitCount @@ -306,22 +466,21 @@ PBXSmartGroupTreeModuleOutlineStateExpansionKey DDC6850D09F5717A004E4BFF + 2C4D9D980CC9EE0B0031092D DD7C45450A6E72DE003FA52B 2CF5510C0CDA28F000627463 - 1C37FBAC04509CD000000102 1C37FAAC04509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 18 + 23 15 - 14 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {266, 694}} + {{0, 88}, {266, 694}} PBXTopSmartGroupGIDs @@ -423,9 +582,9 @@ TableOfContents - 2C07C9450D3582BA002A4079 + 2CAC2BC40D3808A200CA518A 1CE0B1FE06471DED0097A5F4 - 2C07C9460D3582BA002A4079 + 2CAC2BC50D3808A200CA518A 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -557,9 +716,15 @@ 5 WindowOrderList + 1C78EAAD065D492600B07095 1CD10A99069EF8BA00B06720 2C5A593F0D35811F00DCBB8F + 2C36B5750D3585ED00E8D797 + 2C36B5C30D358BF100E8D797 + 2C65660B0CF2236C0041F7DC + 2CAC2C000D380C5700CA518A /Users/eddie/Projekte/UltraStarDX/trunk/Game/Code/MacOSX/UltraStarDX.xcodeproj + 2CAC2C100D380F1200CA518A WindowString 799 242 817 753 0 0 1680 1028 @@ -583,7 +748,7 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - UFiles.pas + version.inc StatusBarVisibility @@ -641,7 +806,7 @@ TableOfContents 2C65660B0CF2236C0041F7DC - 2C5A58BA0D3573FD00DCBB8F + 2CAC2BCC0D38094900CA518A 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -652,7 +817,7 @@ WindowToolGUID 2C65660B0CF2236C0041F7DC WindowToolIsVisible - + FirstTimeWindowDisplayed @@ -761,13 +926,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 2C07C9480D3582BA002A4079 + 2CAC2C070D380C5700CA518A 1C162984064C10D400B95A72 - 2C07C9490D3582BA002A4079 - 2C07C94A0D3582BA002A4079 - 2C07C94B0D3582BA002A4079 - 2C07C94C0D3582BA002A4079 - 2C07C94D0D3582BA002A4079 + 2CAC2C080D380C5700CA518A + 2CAC2C090D380C5700CA518A + 2CAC2C0A0D380C5700CA518A + 2CAC2C0B0D380C5700CA518A + 2CAC2C0C0D380C5700CA518A ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -776,7 +941,7 @@ WindowToolGUID 1CD10A99069EF8BA00B06720 WindowToolIsVisible - + FirstTimeWindowDisplayed @@ -794,12 +959,14 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID 1CDD528C0622207200134675 PBXProjectModuleLabel - avformat.pas + UAudio_bass.pas StatusBarVisibility @@ -820,8 +987,6 @@ 502pt - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -857,8 +1022,8 @@ TableOfContents 1C530D57069F1CE1000CFCEE - 2CE907AC0D1BC9A200A1FDFF - 2CE907AD0D1BC9A200A1FDFF + 2C36B5940D3587D000E8D797 + 2C36B5950D3587D000E8D797 1CDD528C0622207200134675 1CD0528E0623707200166675 @@ -888,8 +1053,6 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -902,7 +1065,7 @@ Frame {{0, 0}, {779, 729}} RubberWindowFrame - 890 238 779 770 0 0 1680 1028 + 886 204 779 770 0 0 1680 1028 Module PBXDebugCLIModule @@ -925,17 +1088,17 @@ TableOfContents 1C78EAAD065D492600B07095 - 2C5A58BB0D3573FD00DCBB8F + 2CAC2C0D0D380C5700CA518A 1C78EAAC065D492600B07095 ToolbarConfiguration xcode.toolbar.config.consoleV3 WindowString - 890 238 779 770 0 0 1680 1028 + 886 204 779 770 0 0 1680 1028 WindowToolGUID 1C78EAAD065D492600B07095 WindowToolIsVisible - + Identifier diff --git a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser index 7e214ce3..65a02a81 100644 --- a/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser +++ b/Game/Code/MacOSX/UltraStarDX.xcodeproj/eddie.pbxuser @@ -1,6 +1,16 @@ // !$*UTF8*$! { - 2C07C94F0D3582C9002A4079 /* PBXTextBookmark */ = { + 2C36B5E20D358CFB00E8D797 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2CF54F5C0CDA1B2B00627463 /* UScreenSing.pas */; + name = "UScreenSing.pas: 321"; + rLen = 0; + rLoc = 8497; + rType = 0; + vrLen = 1569; + vrLoc = 7617; + }; + 2C36B5E30D358CFB00E8D797 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 2C4D9C720CC9EC8C0031092D /* UIni.pas */; name = "UIni.pas: 177"; @@ -27,14 +37,6 @@ sepNavWindowFrame = "{{38, 157}, {797, 845}}"; }; }; - 2C4D9C630CC9EC8C0031092D /* UAudio_bass.pas */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {884, 9100}}"; - sepNavSelRange = "{16714, 12}"; - sepNavVisRect = "{{0, 8384}, {758, 716}}"; - sepNavWindowFrame = "{{15, 178}, {797, 845}}"; - }; - }; 2C4D9C650CC9EC8C0031092D /* UCatCovers.pas */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {923, 2128}}"; @@ -203,9 +205,9 @@ }; 2C4D9C7A0CC9EC8C0031092D /* ULyrics.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {881, 10346}}"; - sepNavSelRange = "{8686, 66}"; - sepNavVisRange = "{8126, 1127}"; + sepNavIntBoundsRect = "{{0, 0}, {1208, 10584}}"; + sepNavSelRange = "{6025, 1}"; + sepNavVisRange = "{5645, 705}"; sepNavVisRect = "{{0, 4395}, {758, 716}}"; sepNavWindowFrame = "{{61, 136}, {797, 845}}"; }; @@ -221,8 +223,9 @@ }; 2C4D9C7C0CC9EC8C0031092D /* UMedia_dummy.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {749, 3920}}"; - sepNavSelRange = "{4805, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {738, 3864}}"; + sepNavSelRange = "{960, 0}"; + sepNavVisRange = "{4488, 788}"; sepNavVisRect = "{{0, 1071}, {749, 470}}"; sepNavWindowFrame = "{{107, 94}, {797, 845}}"; }; @@ -278,8 +281,9 @@ }; 2C4D9C840CC9EC8C0031092D /* URecord.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {758, 5194}}"; - sepNavSelRange = "{7340, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {738, 4046}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1755}"; sepNavVisRect = "{{0, 4312}, {758, 716}}"; sepNavWindowFrame = "{{130, 73}, {797, 845}}"; }; @@ -369,14 +373,6 @@ sepNavWindowFrame = "{{15, 178}, {797, 845}}"; }; }; - 2C4D9D8D0CC9ED230031092D /* Bass.pas */ = { - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1358, 13790}}"; - sepNavSelRange = "{51143, 0}"; - sepNavVisRect = "{{0, 10534}, {715, 815}}"; - sepNavWindowFrame = "{{38, 58}, {754, 944}}"; - }; - }; 2C4D9D900CC9ED4F0031092D /* FreeBitmap.pas */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {974, 24374}}"; @@ -395,9 +391,9 @@ }; 2C4D9DCC0CC9EE6F0031092D /* UDisplay.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {842, 6650}}"; - sepNavSelRange = "{7897, 0}"; - sepNavVisRange = "{7979, 593}"; + sepNavIntBoundsRect = "{{0, 0}, {764, 6454}}"; + sepNavSelRange = "{7920, 10}"; + sepNavVisRange = "{7458, 890}"; sepNavVisRect = "{{0, 4834}, {758, 716}}"; sepNavWindowFrame = "{{38, 157}, {797, 845}}"; }; @@ -531,16 +527,6 @@ sepNavVisRange = "{0, 1181}"; }; }; - 2C5A59420D35813800DCBB8F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2C4D9C720CC9EC8C0031092D /* UIni.pas */; - name = "UIni.pas: 177"; - rLen = 0; - rLoc = 5110; - rType = 0; - vrLen = 1173; - vrLoc = 4819; - }; 2C8937290CE393FB005D8A87 /* UPlatform.pas */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {776, 1638}}"; @@ -559,6 +545,88 @@ sepNavWindowFrame = "{{79, 54}, {776, 956}}"; }; }; + 2CAC2BDD0D3809F500CA518A /* UAudioInput_Bass.pas */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {815, 4018}}"; + sepNavSelRange = "{2733, 0}"; + sepNavVisRange = "{5615, 1821}"; + sepNavWindowFrame = "{{15, 140}, {874, 883}}"; + }; + }; + 2CAC2C030D380C5700CA518A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */; + name = "UltraStarDX.pas: 4"; + rLen = 0; + rLoc = 131; + rType = 0; + vrLen = 126; + vrLoc = 0; + }; + 2CAC2C0F0D380E8700CA518A /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 2C4D9C840CC9EC8C0031092D /* URecord.pas */; + }; + 2CAC2C120D380F1200CA518A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2C4D9C840CC9EC8C0031092D /* URecord.pas */; + name = "URecord.pas: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1755; + vrLoc = 0; + }; + 2CAC2C130D380F1200CA518A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2CAC2BDD0D3809F500CA518A /* UAudioInput_Bass.pas */; + name = "UAudioInput_Bass.pas: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1426; + vrLoc = 2083; + }; + 2CAC2C140D380F1200CA518A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2CAC2BDD0D3809F500CA518A /* UAudioInput_Bass.pas */; + name = "UAudioInput_Bass.pas: 131"; + rLen = 0; + rLoc = 2733; + rType = 0; + vrLen = 1821; + vrLoc = 5615; + }; + 2CAC2C150D380F1200CA518A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = DDC6851B09F57195004E4BFF /* UltraStarDX.pas */; + name = "UltraStarDX.pas: 3"; + rLen = 0; + rLoc = 72; + rType = 0; + vrLen = 152; + vrLoc = 0; + }; + 2CAC2C160D380F1200CA518A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2CF54F5C0CDA1B2B00627463 /* UScreenSing.pas */; + name = "UScreenSing.pas: 320"; + rLen = 0; + rLoc = 8497; + rType = 0; + vrLen = 1601; + vrLoc = 7561; + }; + 2CAC2C170D380F1200CA518A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2C4D9C720CC9EC8C0031092D /* UIni.pas */; + name = "UIni.pas: 177"; + rLen = 0; + rLoc = 5110; + rType = 0; + vrLen = 1173; + vrLoc = 4819; + }; 2CDC716B0CDB9CB70018F966 /* StrUtils.pas */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1013, 1022}}"; @@ -851,11 +919,11 @@ }; 2CF54F5C0CDA1B2B00627463 /* UScreenSing.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {920, 19586}}"; - sepNavSelRange = "{12838, 0}"; - sepNavVisRange = "{12982, 724}"; + sepNavIntBoundsRect = "{{0, 0}, {695, 19880}}"; + sepNavSelRange = "{8497, 0}"; + sepNavVisRange = "{7561, 1601}"; sepNavVisRect = "{{0, 0}, {715, 815}}"; - sepNavWindowFrame = "{{38, 58}, {754, 944}}"; + sepNavWindowFrame = "{{38, 78}, {754, 944}}"; }; }; 2CF54F5D0CDA1B2B00627463 /* UScreenSingModi.pas */ = { @@ -868,9 +936,9 @@ }; 2CF54F5E0CDA1B2B00627463 /* UScreenSong.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1112, 30352}}"; - sepNavSelRange = "{25430, 0}"; - sepNavVisRange = "{24530, 2449}"; + sepNavIntBoundsRect = "{{0, 0}, {842, 31486}}"; + sepNavSelRange = "{54304, 0}"; + sepNavVisRange = "{53982, 735}"; sepNavVisRect = "{{0, 11219}, {1277, 312}}"; sepNavWindowFrame = "{{38, 78}, {754, 944}}"; }; @@ -1023,11 +1091,12 @@ }; DDC6850F09F5717A004E4BFF /* Project object */ = { activeArchitecture = i386; - activeBuildConfigurationName = Debug; + activeBuildConfigurationName = Release; activeExecutable = 2CDD4B5D0CB9354800549FAC /* UltraStarDX */; activeTarget = DDC688C709F574E9004E4BFF /* UltraStarDX */; addToTargets = ( DDC688C709F574E9004E4BFF /* UltraStarDX */, + DDC688D409F57523004E4BFF /* Put all program sources also in this target */, ); breakpoints = ( ); @@ -1158,12 +1227,20 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 221610651; - PBXWorkspaceStateSaveDate = 221610651; + PBXPerProjectTemplateStateSaveDate = 221776031; + PBXWorkspaceStateSaveDate = 221776031; }; perUserProjectItems = { - 2C07C94F0D3582C9002A4079 /* PBXTextBookmark */ = 2C07C94F0D3582C9002A4079 /* PBXTextBookmark */; - 2C5A59420D35813800DCBB8F /* PBXTextBookmark */ = 2C5A59420D35813800DCBB8F /* PBXTextBookmark */; + 2C36B5E20D358CFB00E8D797 /* PBXTextBookmark */ = 2C36B5E20D358CFB00E8D797 /* PBXTextBookmark */; + 2C36B5E30D358CFB00E8D797 /* PBXTextBookmark */ = 2C36B5E30D358CFB00E8D797 /* PBXTextBookmark */; + 2CAC2C030D380C5700CA518A /* PBXTextBookmark */ = 2CAC2C030D380C5700CA518A /* PBXTextBookmark */; + 2CAC2C0F0D380E8700CA518A /* PBXBookmark */ = 2CAC2C0F0D380E8700CA518A /* PBXBookmark */; + 2CAC2C120D380F1200CA518A /* PBXTextBookmark */ = 2CAC2C120D380F1200CA518A /* PBXTextBookmark */; + 2CAC2C130D380F1200CA518A /* PBXTextBookmark */ = 2CAC2C130D380F1200CA518A /* PBXTextBookmark */; + 2CAC2C140D380F1200CA518A /* PBXTextBookmark */ = 2CAC2C140D380F1200CA518A /* PBXTextBookmark */; + 2CAC2C150D380F1200CA518A /* PBXTextBookmark */ = 2CAC2C150D380F1200CA518A /* PBXTextBookmark */; + 2CAC2C160D380F1200CA518A /* PBXTextBookmark */ = 2CAC2C160D380F1200CA518A /* PBXTextBookmark */; + 2CAC2C170D380F1200CA518A /* PBXTextBookmark */ = 2CAC2C170D380F1200CA518A /* PBXTextBookmark */; }; sourceControlManager = 2CDD4B690CB9357000549FAC /* Source Control */; userBuildSettings = { @@ -1172,10 +1249,10 @@ DDC6851B09F57195004E4BFF /* UltraStarDX.pas */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {928, 731}}"; - sepNavSelRange = "{58, 0}"; - sepNavVisRange = "{0, 126}"; + sepNavSelRange = "{72, 0}"; + sepNavVisRange = "{0, 152}"; sepNavVisRect = "{{0, 0}, {948, 730}}"; - sepNavWindowFrame = "{{558, 105}, {987, 859}}"; + sepNavWindowFrame = "{{311, 112}, {987, 859}}"; }; }; DDC6868B09F571C2004E4BFF /* Info.plist */ = { 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 = ""; }; 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 = ""; }; 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 = ""; 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 = ""; }; 98B8BE370B1F949C00162019 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; @@ -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 = ""; tabWidth = 2; }; DDC6868B09F571C2004E4BFF /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 12; lastKnownFileType = text.xml; path = Info.plist; sourceTree = ""; }; - 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 = ""; }; DDC689B309F57C69004E4BFF /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = InfoPlist.strings; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; DDC689B409F57C69004E4BFF /* SDLMain.nib */ = {isa = PBXFileReference; explicitFileType = wrapper.nib; name = SDLMain.nib; path = English.lproj/SDLMain.nib; sourceTree = ""; }; @@ -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 = ""; }; + 2CAC2BF60D380B0800CA518A /* BASS */ = { + isa = PBXGroup; + children = ( + 2CAC2BF70D380B1B00CA518A /* Bass.pas */, + ); + name = BASS; + sourceTree = ""; + }; 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 = ""; }; - 2CE8C7CE0CBAA47D00E4D835 /* BASS */ = { - isa = PBXGroup; - children = ( - 2C4D9D8D0CC9ED230031092D /* Bass.pas */, - ); - name = BASS; - sourceTree = ""; - }; 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 = ""; @@ -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", diff --git a/Game/Code/lib/ffmpeg/version.inc b/Game/Code/lib/ffmpeg/version.inc index e7f32f5a..6ba2bd52 100644 --- a/Game/Code/lib/ffmpeg/version.inc +++ b/Game/Code/lib/ffmpeg/version.inc @@ -33,7 +33,7 @@ const LIBAVUTIL_SUB_VERSION = 0; {$ENDIF} {$IFDEF DARWIN} - av__format = 'libavcodec.dylib'; + av__codec = 'libavcodec.dylib'; LIBAVCODEC_MAJOR_VERSION = 51; LIBAVCODEC_MINOR_VERSION = 0; LIBAVCODEC_SUB_VERSION = 0; -- cgit v1.2.3