Spotlight sorts by track number properly.

Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj

@@ -144,6 +144,7 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "CoreAudio" */;
+			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
 			mainGroup = 089C166AFE841209C02AAC07 /* CoreAudio */;
 			projectDirPath = "";

Plugins/M3u/M3u.xcodeproj/project.pbxproj

@@ -139,6 +139,7 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "M3u" */;
+			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
 			mainGroup = 089C166AFE841209C02AAC07 /* M3u */;
 			projectDirPath = "";

Spotlight/SpotlightPlaylistEntry.h

@@ -12,9 +12,11 @@
 
 @interface SpotlightPlaylistEntry : PlaylistEntry {
     NSNumber *length;
+    NSString *spotlightTrack;
 }
 
 + (SpotlightPlaylistEntry *)playlistEntryWithMetadataItem:(NSMetadataItem *)metadataItem;
 
 @property(retain, readwrite) NSNumber *length;
+@property(retain) NSString *spotlightTrack;
 @end

Spotlight/SpotlightPlaylistEntry.m

@@ -25,10 +25,14 @@ static NSDictionary *importKeys;
     NSArray *artistTransform = 
         [NSArray arrayWithObjects:@"artist", @"AuthorToArtistTransformer", nil];
         
+    // Track numbers must sometimes be converted from NSNumber to NSString
+    NSArray *trackTransform = 
+        [NSArray arrayWithObjects:@"spotlightTrack", @"NumberToStringTransformer", nil];
+    
     importKeys = [[NSDictionary dictionaryWithObjectsAndKeys:
         @"title",                   @"kMDItemTitle",
         @"album",                   @"kMDItemAlbum",
-        @"track",                   @"kMDItemAudioTrackNumber",
+        trackTransform,             @"kMDItemAudioTrackNumber",
         @"year",                    @"kMDItemRecordingYear",
         @"genre",                   @"kMDItemMusicalGenre",
         @"length",                  @"kMDItemDurationSeconds",
@@ -82,5 +86,6 @@ static NSDictionary *importKeys;
 }
 
 @synthesize length;
+@synthesize spotlightTrack;
 
 @end

Spotlight/SpotlightTransformers.h

@@ -26,3 +26,6 @@
 
 @interface StringToSearchScopeTransformer: NSValueTransformer {}
 @end
+
+@interface NumberToStringTransformer: NSValueTransformer {}
+@end

Spotlight/SpotlightTransformers.m

@@ -85,3 +85,23 @@ static SpotlightWindowController * searchController;
 }
 
 @end
+
+@implementation NumberToStringTransformer
+
++ (Class)transformedValueClass { return [NSString class]; }
++ (BOOL)allowsReverseTransformation { return NO; }
+
+// Convert from NSNumber to NSString
+- (id)transformedValue:(id)value {
+    if (value == nil) return nil;
+    
+    // If there's an NS/CFNumber hiding in here...
+    if([value respondsToSelector:@selector(stringValue:)])
+    {
+        return [value stringValue];
+    }
+    
+    return value; 
+}
+
+@end