Changeset 9151

Timestamp:

Sep 20, 2009, 8:58:13 PM (13 years ago)

Author:

livings124

Message:

use NSSearchPathForDirectoriesInDomains() for searching for sounds

Location:

trunk/macosx

Files:

• CreatorWindowController.m (modified) (2 diffs)
• PrefsController.m (modified) (1 diff)

trunk/macosx/CreatorWindowController.m

@@ -143 +143 @@
     [fNameField setToolTip: fPath];
     
-    BOOL multifile = !fInfo->isSingleFile;
+    const BOOL multifile = !fInfo->isSingleFile;
     
     NSImage * icon = [[NSWorkspace sharedWorkspace] iconForFileType: multifile
@@ -163 +163 @@
     [fStatusField setStringValue: statusString];
     
-    const int piecesCount = fInfo->pieceCount;
-    if (piecesCount == 1)
+    if (fInfo->pieceCount == 1)
         [fPiecesField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"1 piece, %@", "Create torrent -> info"),
                                                             [NSString stringForFileSize: fInfo->pieceSize]]];
     else
         [fPiecesField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%d pieces, %@ each", "Create torrent -> info"),
-                                                            piecesCount, [NSString stringForFileSize: fInfo->pieceSize]]];
+                                                            fInfo->pieceCount, [NSString stringForFileSize: fInfo->pieceSize]]];
     
     fLocation = [[[[fDefaults stringForKey: @"CreatorLocation"] stringByExpandingTildeInPath] stringByAppendingPathComponent:

trunk/macosx/PrefsController.m

@@ -420 +420 @@
     NSMutableArray * sounds = [NSMutableArray array];
     
-    NSArray * directories = [NSArray arrayWithObjects: @"/System/Library/Sounds", @"/Library/Sounds", @"Library/Sounds", nil];
+    NSArray * directories = NSSearchPathForDirectoriesInDomains(NSAllLibrariesDirectory,
+                                NSUserDomainMask | NSLocalDomainMask | NSSystemDomainMask, YES);
     
     for (NSString * directory in directories)
     {
+        directory = [directory stringByAppendingPathComponent: @"Sounds"];
+        
         BOOL isDirectory;
         if ([[NSFileManager defaultManager] fileExistsAtPath: directory isDirectory: &isDirectory] && isDirectory)