From 115255f6a3c2be422680710b5d6ba4226c3383a6 Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 15 Jun 2010 21:28:52 +0000
Subject: merged trunk r2528 into us_maker branch

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2530 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 us_maker_edition/src/base/UPlatformMacOSX.pas | 34 ++++++++++++++++++---------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'us_maker_edition/src/base/UPlatformMacOSX.pas')

diff --git a/us_maker_edition/src/base/UPlatformMacOSX.pas b/us_maker_edition/src/base/UPlatformMacOSX.pas
index d55e8bea..7115a6b0 100644
--- a/us_maker_edition/src/base/UPlatformMacOSX.pas
+++ b/us_maker_edition/src/base/UPlatformMacOSX.pas
@@ -108,7 +108,10 @@ type
        *}
       procedure CreateUserFolders();
 
-      function GetHomeDir(): IPath;
+      {**
+       * GetHomeDir returns the path to $HOME.
+       *}
+      function GetHomeDir: IPath;
 
     public
       {**
@@ -121,13 +124,19 @@ type
 
       {**
        * GetLogPath returns the path for log messages. Currently it is set to
-       * $HOME/Library/Application Support/UltraStarDeluxe/log.
+       * $HOME/Library/Logs/UltraStar Deluxe/.
        *}
       function  GetLogPath:        IPath; override;
 
+      {**
+       * GetMusicPath returns the path for music. Currently it is set to
+       * $HOME/Music/UltraStar Deluxe/.
+       *}
+      function  GetMusicPath:      IPath; override;
+
       {**
        * GetGameSharedPath returns the path for shared resources. Currently it
-       * is set to /Library/Application Support/UltraStarDeluxe.
+       * is also set to $HOME/Library/Application Support/UltraStarDeluxe.
        * However it is not used.
        *}
       function  GetGameSharedPath: IPath; override;
@@ -135,7 +144,7 @@ type
       {**
        * GetGameUserPath returns the path for user resources. Currently it is
        * set to $HOME/Library/Application Support/UltraStarDeluxe.
-       * This is where a user can add songs, themes, ....
+       * This is where a user can add themes, ....
        *}
       function  GetGameUserPath:   IPath; override;
   end;
@@ -251,21 +260,24 @@ begin
   Result := GetExecutionDir().GetParent().GetParent();
 end;
 
-function TPlatformMacOSX.GetApplicationSupportPath: IPath;
-const
-  PathName: string = 'Library/Application Support/UltraStarDeluxe';
+function TPlatformMacOSX.GetHomeDir: IPath;
 begin
-  Result := GetHomeDir().Append(PathName, pdAppend);
+  Result := Path(GetEnvironmentVariable('HOME'));
 end;
 
-function TPlatformMacOSX.GetHomeDir(): IPath;
+function TPlatformMacOSX.GetApplicationSupportPath: IPath;
 begin
-  Result := Path(GetEnvironmentVariable('HOME'));
+  Result := GetHomeDir.Append('Library/Application Support/UltraStarDeluxe', pdAppend);
 end;
 
 function TPlatformMacOSX.GetLogPath: IPath;
 begin
-  Result := GetApplicationSupportPath.Append('logs');
+  Result := GetHomeDir.Append('Library/Logs/UltraStar Deluxe', pdAppend);
+end;
+
+function TPlatformMacOSX.GetMusicPath: IPath;
+begin
+  Result := GetHomeDir.Append('Music/UltraStar Deluxe', pdAppend);
 end;
 
 function TPlatformMacOSX.GetGameSharedPath: IPath;
-- 
cgit v1.2.3