Changeset 1040

Timestamp:

10/28/07 12:01:36 (15 months ago)

Author:

stephen_booth

Message:

Leopard updates

Location:

trunk

Files:

• AudioLibrary/AudioLibrary.m (modified) (17 diffs)
• Utilities/UtilityFunctions.h (modified) (1 diff)
• Utilities/UtilityFunctions.m (modified) (1 diff)

trunk/AudioLibrary/AudioLibrary.m

@@ -92 +92 @@
 #import "ImageAndTextCell.h"
 
+// Hacky 10.4 workarounds
 #import "NSTreeController_Extensions.h"
 
@@ -162 +163 @@
 #define STREAM_TABLE_COLUMNS_MENU_ITEM_INDEX            6
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
 // ========================================
-// Completely bogus NSTreeController bindings hack
+// Completely bogus NSTreeController bindings hack (unnecessary on 10.5)
 // ========================================
 @interface NSObject (NSTreeControllerBogosity)
 - (id) observedObject;
 @end
-#endif
 
 // ========================================
@@ -208 +207 @@
 - (void) saveBrowserStateToDefaults;
 - (void) restoreBrowserStateFromDefaults;
+- (BOOL) selectBrowserNode:(BrowserNode *)node;
 
 - (void) setupStreamTableColumns;
@@ -711 +711 @@
 - (IBAction) browseLibrary:(id)sender
 {
-        /*BOOL success =*/ [_browserController setSelectionIndexPath:[_browserController arrangedIndexPathForObject:_libraryNode]];
+        [self selectBrowserNode:_libraryNode];
 }
 
 - (IBAction) browseMostPopular:(id)sender
 {
-        /*BOOL success =*/ [_browserController setSelectionIndexPath:[_browserController arrangedIndexPathForObject:_mostPopularNode]];
+        [self selectBrowserNode:_mostPopularNode];
 }
 
 - (IBAction) browseHighestRated:(id)sender
 {
-        /*BOOL success =*/ [_browserController setSelectionIndexPath:[_browserController arrangedIndexPathForObject:_highestRatedNode]];
+        [self selectBrowserNode:_highestRatedNode];
 }
 
 - (IBAction) browseRecentlyAdded:(id)sender
 {
-        /*BOOL success =*/ [_browserController setSelectionIndexPath:[_browserController arrangedIndexPathForObject:_recentlyAddedNode]];
+        [self selectBrowserNode:_recentlyAddedNode];
 }
 
 - (IBAction) browseRecentlyPlayed:(id)sender
 {
-        /*BOOL success =*/ [_browserController setSelectionIndexPath:[_browserController arrangedIndexPathForObject:_recentlyPlayedNode]];
+        [self selectBrowserNode:_recentlyPlayedNode];
 }
 
 - (IBAction) browseRecentlySkipped:(id)sender
 {
-        /*BOOL success =*/ [_browserController setSelectionIndexPath:[_browserController arrangedIndexPathForObject:_recentlySkippedNode]];
+        [self selectBrowserNode:_recentlySkippedNode];
 }
 
@@ -745 +745 @@
         BrowserNode *artistNode = [_artistsNode findChildNamed:artist];
         if(nil != artistNode)
-                return [_browserController setSelectionIndexPath:[_browserController arrangedIndexPathForObject:artistNode]];
+                return [self selectBrowserNode:artistNode];
         else
                 return NO;
@@ -756 +756 @@
         BrowserNode *albumNode = [_albumsNode findChildNamed:album];
         if(nil != albumNode)
-                return [_browserController setSelectionIndexPath:[_browserController arrangedIndexPathForObject:albumNode]];
+                return [self selectBrowserNode:albumNode];
         else
                 return NO;
@@ -767 +767 @@
         BrowserNode *composerNode = [_composersNode findChildNamed:composer];
         if(nil != composerNode)
-                return [_browserController setSelectionIndexPath:[_browserController arrangedIndexPathForObject:composerNode]];
+                return [self selectBrowserNode:composerNode];
         else
                 return NO;
@@ -778 +778 @@
         BrowserNode *genreNode = [_genresNode findChildNamed:genre];
         if(nil != genreNode)
-                return [_browserController setSelectionIndexPath:[_browserController arrangedIndexPathForObject:genreNode]];
+                return [self selectBrowserNode:genreNode];
         else    
                 return NO;
@@ -789 +789 @@
         BrowserNode *playlistNode = [_playlistsNode findChildNamed:playlistName];
         if(nil != playlistNode)
-                return [_browserController setSelectionIndexPath:[_browserController arrangedIndexPathForObject:playlistNode]];
+                return [self selectBrowserNode:playlistNode];
         else    
                 return NO;
@@ -800 +800 @@
         BrowserNode *smartPlaylistNode = [_smartPlaylistsNode findChildNamed:smartPlaylistName];
         if(nil != smartPlaylistNode)
-                return [_browserController setSelectionIndexPath:[_browserController arrangedIndexPathForObject:smartPlaylistName]];
+                return [self selectBrowserNode:smartPlaylistNode];
         else    
                 return NO;
@@ -1766 +1766 @@
 - (BOOL) outlineView:(NSOutlineView *)outlineView shouldEditTableColumn:(NSTableColumn *)tableColumn item:(id)item
 {
-        BrowserNode *node = [item observedObject];
+        BrowserNode *node = nil;
+        
+        // In Leopard observedObject no longer works (which is a good thing)
+        if(nil != NSClassFromString(@"NSTreeNode"))
+                node = [item representedObject];
+        else
+                node = [item observedObject];
+
         return [node nameIsEditable];
 }
@@ -1782 +1789 @@
 - (void) outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
 {
-        BrowserNode *node = [item observedObject];
+        BrowserNode *node = nil;
+        
+        // In Leopard observedObject no longer works (which is a good thing)
+        if(nil != NSClassFromString(@"NSTreeNode"))
+                node = [item representedObject];
+        else
+                node = [item observedObject];
+
         [(ImageAndTextCell *)cell setImage:[node icon]];
 
@@ -1797 +1811 @@
         int                                                     selectedRow                     = [outlineView selectedRow];
         id                                                      opaqueNode                      = [outlineView itemAtRow:selectedRow];
-        BrowserNode                                     *node                           = [opaqueNode observedObject];
+        BrowserNode                                     *node                           = nil;
         NSArray                                         *selected                       = [_streamController selectedObjects];
         NSDictionary                            *bindingInfo            = [_streamController infoForBinding:@"contentArray"];
         AudioStreamCollectionNode       *oldStreamsNode         = [bindingInfo valueForKey:NSObservedObjectKey];
+
+        // In Leopard observedObject no longer works (which is a good thing)
+        if(nil != NSClassFromString(@"NSTreeNode"))
+                node = [opaqueNode representedObject];
+        else
+                node = [opaqueNode observedObject];
 
         // Unbind the current stream source
@@ -1809 +1829 @@
         // Don't do anything except possibly save the sort descriptors if the user selected nothing
         if(nil == node) {
-
                 if(NO == [oldStreamsNode streamsAreOrdered]) {
                         [_streamTableSavedSortDescriptors release], _streamTableSavedSortDescriptors = nil;
@@ -2490 +2509 @@
 }
 
+- (BOOL) selectBrowserNode:(BrowserNode *)node
+{
+        NSParameterAssert(nil != node);
+        
+        NSIndexPath *indexPath = nil;
+        
+        // If the NSTreeNode class is present, use it
+        if(nil != NSClassFromString(@"NSTreeNode")) {
+                NSEnumerator    *enumerator             = [[[_browserController arrangedObjects] childNodes] objectEnumerator];
+                NSTreeNode              *child                  = nil;
+                NSTreeNode              *match                  = nil;
+                
+                while(nil == match && (child = [enumerator nextObject]))
+                        match = treeNodeForRepresentedObject(child, node);
+                
+                indexPath = [match indexPath];
+        }
+        // Otherwise use hacky-10.4 workarounds
+        else
+                indexPath = [_browserController arrangedIndexPathForObject:node];
+        
+        return [_browserController setSelectionIndexPath:indexPath];    
+}
+
 - (void) setupStreamTableColumns
 {
@@ -2557 +2600 @@
                 [contextMenuItem setState:([[visibleDictionary objectForKey:[obj identifier]] boolValue] ? NSOnState : NSOffState)];
                 
-                //              NSLog(@"setting width of %@ to %f", [obj identifier], [[sizesDictionary objectForKey:[obj identifier]] floatValue]);
+//              NSLog(@"setting width of %@ to %f", [obj identifier], [[sizesDictionary objectForKey:[obj identifier]] floatValue]);
                 [obj setWidth:[[sizesDictionary objectForKey:[obj identifier]] floatValue]];
                 
-                if([[visibleDictionary objectForKey:[obj identifier]] boolValue]) {
+                if([[visibleDictionary objectForKey:[obj identifier]] boolValue])
                         [_streamTableVisibleColumns addObject:obj];
-                }
-                else {
+                else
                         [_streamTableHiddenColumns addObject:obj];
-                        [_streamTable removeTableColumn:obj];
-                }
-        }
-        
+        }
+
+        // Don't modify table columns while enumerating
+        enumerator = [_streamTableHiddenColumns objectEnumerator];
+        while((obj = [enumerator nextObject]))
+                [_streamTable removeTableColumn:obj];
+
         i = 0;
         enumerator = [orderArray objectEnumerator];
@@ -2649 +2694 @@
                 [obj setWidth:[[sizesDictionary objectForKey:[obj identifier]] floatValue]];
                 
-                if([[visibleDictionary objectForKey:[obj identifier]] boolValue]) {
+                if([[visibleDictionary objectForKey:[obj identifier]] boolValue])
                         [_playQueueTableVisibleColumns addObject:obj];
-                }
-                else {
+                else
                         [_playQueueTableHiddenColumns addObject:obj];
-                        [_playQueueTable removeTableColumn:obj];
-                }
-        }
+        }
+
+        // Don't modify table columns while enumerating
+        enumerator = [_playQueueTableHiddenColumns objectEnumerator];
+        while((obj = [enumerator nextObject]))
+                [_playQueueTable removeTableColumn:obj];
         
         i = 0;

trunk/Utilities/UtilityFunctions.h

@@ -45 +45 @@
         NSData * getBitmapDataForImage(NSImage *image, NSBitmapImageFileType type);
         
+        NSTreeNode * treeNodeForRepresentedObject(NSTreeNode *root, id representedObject);
+
 #ifdef __cplusplus
 }

trunk/Utilities/UtilityFunctions.m

@@ -219 +219 @@
         return [bitmapRep representationUsingType:type properties:nil]; 
 }
+
+NSTreeNode * 
+treeNodeForRepresentedObject(NSTreeNode *root, id representedObject)
+{
+        NSCParameterAssert(nil != root);
+        NSCParameterAssert(nil != representedObject);
+        
+        // Termination condition
+        if([[root representedObject] isEqual:representedObject])
+                return root;
+        
+        NSEnumerator    *enumerator             = [[root childNodes] objectEnumerator];
+        NSTreeNode              *child                  = nil;
+        NSTreeNode              *match                  = nil;
+        
+        // Perform a breadth-first search
+        while(nil == match && (child = [enumerator nextObject])) {
+                if([[child representedObject] isEqual:representedObject])
+                        match = child;
+        }
+        
+        if(nil == match) {
+                enumerator      = [[root childNodes] objectEnumerator];
+                child           = nil;
+                
+                while(nil == match && (child = [enumerator nextObject]))
+                        match = treeNodeForRepresentedObject(child, representedObject);
+        }
+        
+        return match;
+}