Implemented time ticking in song info status window.

[MenuTunes.git] / MenuController.m

diff --git a/MenuController.m b/MenuController.m
index 9c7f9b5..7c418be 100755 (executable)
--- a/MenuController.m
+++ b/MenuController.m
@@ -8,20 +8,27 @@
 
 #import "MenuController.h"
 #import "MainController.h"
 
 #import "MenuController.h"
 #import "MainController.h"

+#import "NetworkController.h"

 #import "ITMTRemote.h"
 #import "ITMTRemote.h"

+#import "PlaylistNode.h"

 #import <ITFoundation/ITDebug.h>
 #import <ITKit/ITHotKeyCenter.h>
 #import <ITKit/ITHotKey.h>
 #import <ITKit/ITKeyCombo.h>
 #import <ITKit/ITCategory-NSMenu.h>
 #import <ITFoundation/ITDebug.h>
 #import <ITKit/ITHotKeyCenter.h>
 #import <ITKit/ITHotKey.h>
 #import <ITKit/ITKeyCombo.h>
 #import <ITKit/ITCategory-NSMenu.h>

+#import <ITKit/ITAboutWindowController.h>

 
 @interface MenuController (SubmenuMethods)
 - (NSMenu *)ratingMenu;
 - (NSMenu *)upcomingSongsMenu;
 - (NSMenu *)playlistsMenu;
 - (NSMenu *)eqMenu;
 
 @interface MenuController (SubmenuMethods)
 - (NSMenu *)ratingMenu;
 - (NSMenu *)upcomingSongsMenu;
 - (NSMenu *)playlistsMenu;
 - (NSMenu *)eqMenu;

+- (NSMenu *)artistsMenu;
+- (NSMenu *)albumsMenu;
+- (void)playlistsMenuAux:(NSMenu *)menu node:(PlaylistNode *)node tagPrefix:(int)p;

 - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
 - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers

-        onItem:(NSMenuItem *)item;
+        onItem:(id <NSMenuItem>)item;
+- (BOOL)iPodWithNameAutomaticallyUpdates:(NSString *)name;

 @end
 
 @implementation MenuController
 @end
 
 @implementation MenuController


@@ -41,17 +48,18 @@
     NSArray *menuArray = [defaults arrayForKey:@"menu"];
     NSEnumerator *enumerator = [menuArray objectEnumerator];
     NSString *nextObject;
     NSArray *menuArray = [defaults arrayForKey:@"menu"];
     NSEnumerator *enumerator = [menuArray objectEnumerator];
     NSString *nextObject;

-    NSMenuItem *tempItem;
+    id <NSMenuItem> tempItem;

     NSEnumerator *itemEnum;
     ITHotKey *hotKey;
     NSArray *hotKeys = [[ITHotKeyCenter sharedCenter] allHotKeys];
     NSEnumerator *itemEnum;
     ITHotKey *hotKey;
     NSArray *hotKeys = [[ITHotKeyCenter sharedCenter] allHotKeys];

-    int currentSongRating;
+    ITMTRemote *mtr = [[MainController sharedController] currentRemote];
+    int currentSongRating = 0;

     
     //Get the information
     NS_DURING
     
     //Get the information
     NS_DURING

-        _currentPlaylist = [[[MainController sharedController] currentRemote] currentPlaylistIndex];
-        _playingRadio = ([[[MainController sharedController] currentRemote] currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist);
-        currentSongRating = ( [[[MainController sharedController] currentRemote] currentSongRating] != -1 );
+        _currentPlaylist = [mtr currentPlaylistIndex];
+        _playingRadio = ([mtr currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist);
+        currentSongRating = ( [mtr currentSongRating] != -1 );

     NS_HANDLER
         [[MainController sharedController] networkError:localException];
     NS_ENDHANDLER
     NS_HANDLER
         [[MainController sharedController] networkError:localException];
     NS_ENDHANDLER


@@ -79,6 +87,16 @@
         [tempItem setSubmenu:nil];
     }
     
         [tempItem setSubmenu:nil];
     }
     

+    if ( (tempItem = [_currentMenu itemWithTag:5]) ) {
+        ITDebugLog(@"Removing \"Artists\" submenu.");
+        [tempItem setSubmenu:nil];
+    }
+    
+    if ( (tempItem = [_currentMenu itemWithTag:6]) ) {
+        ITDebugLog(@"Removing \"Albums\" submenu.");
+        [tempItem setSubmenu:nil];
+    }
+    

     ITDebugLog(@"Begin building menu.");
     
     //create our menu
     ITDebugLog(@"Begin building menu.");
     
     //create our menu


@@ -104,7 +122,7 @@
             
             ITDebugLog(@"Set \"Play\"/\"Pause\" menu item's title to correct state.");
             NS_DURING
             
             ITDebugLog(@"Set \"Play\"/\"Pause\" menu item's title to correct state.");
             NS_DURING

-                switch ([[[MainController sharedController] currentRemote] playerPlayingState]) {
+                switch ([mtr playerPlayingState]) {

                     case ITMTRemotePlayerPlaying:
                         [tempItem setTitle:NSLocalizedString(@"pause", @"Pause")];
                     break;
                     case ITMTRemotePlayerPlaying:
                         [tempItem setTitle:NSLocalizedString(@"pause", @"Pause")];
                     break;


@@ -181,7 +199,7 @@
             NS_DURING
                 tempItem = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@",
                                 NSLocalizedString(@"show", @"Show"),
             NS_DURING
                 tempItem = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@",
                                 NSLocalizedString(@"show", @"Show"),

-                                    [[[MainController sharedController] currentRemote] playerSimpleName]]
+                                    [mtr playerSimpleName]]

                                 action:@selector(performMainMenuAction:)
                                 keyEquivalent:@""];
             NS_HANDLER
                                 action:@selector(performMainMenuAction:)
                                 keyEquivalent:@""];
             NS_HANDLER


@@ -207,7 +225,14 @@
                     keyEquivalent:@""];
             [tempItem setTag:MTMenuPreferencesItem];
             [tempItem setTarget:self];
                     keyEquivalent:@""];
             [tempItem setTag:MTMenuPreferencesItem];
             [tempItem setTarget:self];

-        } else if ([nextObject isEqualToString:@"quit"]) {
+        } else if ([nextObject isEqualToString:@"about"]) {
+                       ITDebugLog(@"Add \"About MenuTunes...\" menu item.");
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"about", @"About MenuTunes...")
+                    action:@selector(performMainMenuAction:)
+                    keyEquivalent:@""];
+            [tempItem setTag:MTMenuAboutItem];
+            [tempItem setTarget:self];
+               } else if ([nextObject isEqualToString:@"quit"]) {

             if ([[MainController sharedController] blingBling] == NO) {
                 ITDebugLog(@"Add \"Register MenuTunes...\" menu item.");
                 tempItem = [menu addItemWithTitle:NSLocalizedString(@"register", @"Register MenuTunes...") action:@selector(performMainMenuAction:) keyEquivalent:@""];
             if ([[MainController sharedController] blingBling] == NO) {
                 ITDebugLog(@"Add \"Register MenuTunes...\" menu item.");
                 tempItem = [menu addItemWithTitle:NSLocalizedString(@"register", @"Register MenuTunes...") action:@selector(performMainMenuAction:) keyEquivalent:@""];


@@ -223,10 +248,10 @@
         } else if ([nextObject isEqualToString:@"trackInfo"]) {
             ITDebugLog(@"Check to see if a Track is playing...");
             //Handle playing radio too
         } else if ([nextObject isEqualToString:@"trackInfo"]) {
             ITDebugLog(@"Check to see if a Track is playing...");
             //Handle playing radio too

-            if (_currentPlaylist) {
-                NSString *title;
+            if (_currentTrack != -1 && _currentPlaylist > 0) {
+                NSString *title = nil;

                 NS_DURING
                 NS_DURING

-                    title = [[[MainController sharedController] currentRemote] currentSongTitle];
+                    title = [mtr currentSongTitle];

                 NS_HANDLER
                     [[MainController sharedController] networkError:localException];
                 NS_ENDHANDLER
                 NS_HANDLER
                     [[MainController sharedController] networkError:localException];
                 NS_ENDHANDLER


@@ -242,9 +267,9 @@
                 
                 if (!_playingRadio) {
                     if ([defaults boolForKey:@"showAlbum"]) {
                 
                 if (!_playingRadio) {
                     if ([defaults boolForKey:@"showAlbum"]) {

-                        NSString *curAlbum;
+                        NSString *curAlbum = nil;

                         NS_DURING
                         NS_DURING

-                            curAlbum = [[[MainController sharedController] currentRemote] currentSongAlbum];
+                            curAlbum = [mtr currentSongAlbum];

                         NS_HANDLER
                             [[MainController sharedController] networkError:localException];
                         NS_ENDHANDLER
                         NS_HANDLER
                             [[MainController sharedController] networkError:localException];
                         NS_ENDHANDLER


@@ -256,9 +281,9 @@
                     }
                     
                     if ([defaults boolForKey:@"showArtist"]) {
                     }
                     
                     if ([defaults boolForKey:@"showArtist"]) {

-                        NSString *curArtist;
+                        NSString *curArtist = nil;

                         NS_DURING
                         NS_DURING

-                            curArtist = [[[MainController sharedController] currentRemote] currentSongArtist];
+                            curArtist = [mtr currentSongArtist];

                         NS_HANDLER
                             [[MainController sharedController] networkError:localException];
                         NS_ENDHANDLER
                         NS_HANDLER
                             [[MainController sharedController] networkError:localException];
                         NS_ENDHANDLER


@@ -269,10 +294,24 @@
                         }
                     }
                     
                         }
                     }
                     

+                    if ([defaults boolForKey:@"showComposer"]) {
+                        NSString *curComposer = nil;
+                        NS_DURING
+                            curComposer = [mtr currentSongComposer];
+                        NS_HANDLER
+                            [[MainController sharedController] networkError:localException];
+                        NS_ENDHANDLER
+                        ITDebugLog(@"Add Track Composer (\"%@\") menu item.", curComposer);
+                        if ( curComposer ) {
+                            [menu indentItem:
+                                [menu addItemWithTitle:curComposer action:nil keyEquivalent:@""]];
+                        }
+                    }
+                    

                     if ([defaults boolForKey:@"showTrackNumber"]) {
                     if ([defaults boolForKey:@"showTrackNumber"]) {

-                        int track;
+                        int track = 0;

                         NS_DURING
                         NS_DURING

-                            track = [[[MainController sharedController] currentRemote] currentSongTrack];
+                            track = [mtr currentSongTrack];

                         NS_HANDLER
                             [[MainController sharedController] networkError:localException];
                         NS_ENDHANDLER
                         NS_HANDLER
                             [[MainController sharedController] networkError:localException];
                         NS_ENDHANDLER


@@ -285,9 +324,9 @@
                 }
                 
                 NS_DURING
                 }
                 
                 NS_DURING

-                    if ([defaults boolForKey:@"showTime"] && ( ([[[MainController sharedController] currentRemote] currentSongElapsed] != nil) || ([[[MainController sharedController] currentRemote] currentSongLength] != nil) )) {
-                        ITDebugLog(@"Add Track Elapsed (\"%@/%@\") menu item.", [[[MainController sharedController] currentRemote] currentSongElapsed], [[[MainController sharedController] currentRemote] currentSongLength]);
-                        [menu indentItem:[menu addItemWithTitle:[NSString stringWithFormat:@"%@/%@", [[[MainController sharedController] currentRemote] currentSongElapsed], [[[MainController sharedController] currentRemote] currentSongLength]] action:nil keyEquivalent:@""]];
+                    if ([defaults boolForKey:@"showTime"] && ( ([mtr currentSongElapsed] != nil) || ([mtr currentSongLength] != nil) )) {
+                        ITDebugLog(@"Add Track Elapsed (\"%@/%@\") menu item.", [mtr currentSongElapsed], [mtr currentSongLength]);
+                        [menu indentItem:[menu addItemWithTitle:[NSString stringWithFormat:@"%@/%@", [mtr currentSongElapsed], [mtr currentSongLength]] action:nil keyEquivalent:@""]];

                     }
                 NS_HANDLER
                     [[MainController sharedController] networkError:localException];
                     }
                 NS_HANDLER
                     [[MainController sharedController] networkError:localException];


@@ -295,9 +334,12 @@
                 
                 if (!_playingRadio) {
                     NS_DURING
                 
                 if (!_playingRadio) {
                     NS_DURING

-                        if ([defaults boolForKey:@"showTrackRating"] && ( [[[MainController sharedController] currentRemote] currentSongRating] != -1.0 )) {
+                        if ([defaults boolForKey:@"showPlayCount"] && [mtr currentSource] == ITMTRemoteLibrarySource) {
+                            [menu indentItem:[menu addItemWithTitle:[NSString stringWithFormat:@"Play Count: %i", [mtr currentSongPlayCount]] action:nil keyEquivalent:@""]];
+                        }
+                        if ([defaults boolForKey:@"showTrackRating"] && ( [mtr currentSongRating] != -1.0 )) {

                             NSString *string = nil;
                             NSString *string = nil;

-                            switch ((int)([[[MainController sharedController] currentRemote] currentSongRating] * 5)) {
+                            switch ((int)([mtr currentSongRating] * 5)) {

                                 case 0:
                                     string = [NSString stringWithUTF8String:"☆☆☆☆☆"];
                                 break;
                                 case 0:
                                     string = [NSString stringWithUTF8String:"☆☆☆☆☆"];
                                 break;


@@ -323,6 +365,23 @@
                     NS_HANDLER
                         [[MainController sharedController] networkError:localException];
                     NS_ENDHANDLER
                     NS_HANDLER
                         [[MainController sharedController] networkError:localException];
                     NS_ENDHANDLER

+                    
+                    /*if ([tempItem respondsToSelector:@selector(setAttributedTitle:)] && [defaults boolForKey:@"showAlbumArtwork"] && ![[NetworkController sharedController] isConnectedToServer]) {
+                        NSImage *image = [mtr currentSongAlbumArt];
+                        if (image) {
+                            NSSize oldSize, newSize;
+                            oldSize = [image size];
+                            if (oldSize.width > oldSize.height) newSize = NSMakeSize(110,oldSize.height * (110.0f / oldSize.width));
+                            else newSize = NSMakeSize(oldSize.width * (110.0f / oldSize.height),110);
+                            image = [[[[NSImage alloc] initWithData:[image TIFFRepresentation]] autorelease] imageScaledSmoothlyToSize:newSize];
+                            
+                            tempItem = [menu addItemWithTitle:@"" action:nil keyEquivalent:@""];
+                            NSTextAttachment *attachment = [[[NSTextAttachment alloc] init] autorelease];
+                            [[attachment attachmentCell] setImage:image];
+                            NSAttributedString *attrString = [NSAttributedString attributedStringWithAttachment:attachment];
+                            [tempItem setAttributedTitle:attrString];
+                        }
+                    }*/

                 }
             } else {
                 ITDebugLog(@"No Track is Playing, Add \"No Song\" menu item.");
                 }
             } else {
                 ITDebugLog(@"No Track is Playing, Add \"No Song\" menu item.");


@@ -352,43 +411,58 @@
                 [tempItem setState:NSOffState];
             }
             NS_DURING
                 [tempItem setState:NSOffState];
             }
             NS_DURING

-                [[_eqMenu itemAtIndex:([[[MainController sharedController] currentRemote] currentEQPresetIndex] - 1)] setState:NSOnState];
+                [[_eqMenu itemAtIndex:0] setState:[mtr equalizerEnabled] ? NSOnState : NSOffState];
+                [[_eqMenu itemAtIndex:([mtr currentEQPresetIndex] + 1)] setState:NSOnState];

             NS_HANDLER
                 [[MainController sharedController] networkError:localException];
             NS_ENDHANDLER
         } else if ([nextObject isEqualToString:@"songRating"] && currentSongRating) {
             NS_HANDLER
                 [[MainController sharedController] networkError:localException];
             NS_ENDHANDLER
         } else if ([nextObject isEqualToString:@"songRating"] && currentSongRating) {

-                ITDebugLog(@"Add \"Song Rating\" submenu.");
-                tempItem = [menu addItemWithTitle:NSLocalizedString(@"songRating", @"Song Rating")
-                        action:nil
-                        keyEquivalent:@""];
-                [tempItem setSubmenu:_ratingMenu];
-                [tempItem setTag:1];
-                if (_playingRadio || !_currentPlaylist) {
-                    [tempItem setEnabled:NO];
-                }
-                
-                itemEnum = [[_ratingMenu itemArray] objectEnumerator];
-                while ( (tempItem = [itemEnum nextObject]) ) {
-                    [tempItem setState:NSOffState];
-                }
-                
-                NS_DURING
-                    [[_ratingMenu itemAtIndex:([[[MainController sharedController] currentRemote] currentSongRating] * 5)] setState:NSOnState];
-                NS_HANDLER
-                    [[MainController sharedController] networkError:localException];
-                NS_ENDHANDLER
-            } else if ([nextObject isEqualToString:@"upcomingSongs"]) {
-                ITDebugLog(@"Add \"Upcoming Songs\" submenu.");
-                tempItem = [menu addItemWithTitle:NSLocalizedString(@"upcomingSongs", @"Upcoming Songs")
-                        action:nil
-                        keyEquivalent:@""];
-                [tempItem setSubmenu:_upcomingSongsMenu];
-                [tempItem setTag:2];
-                if (_playingRadio || !_currentPlaylist) {
-                    [tempItem setEnabled:NO];
-                }
+            ITDebugLog(@"Add \"Song Rating\" submenu.");
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"songRating", @"Song Rating")
+                    action:nil
+                    keyEquivalent:@""];
+            [tempItem setSubmenu:_ratingMenu];
+            [tempItem setTag:1];
+            if (_playingRadio || !_currentPlaylist) {
+                [tempItem setEnabled:NO];

             }
             }

+            
+            itemEnum = [[_ratingMenu itemArray] objectEnumerator];
+            while ( (tempItem = [itemEnum nextObject]) ) {
+                [tempItem setState:NSOffState];
+            }
+            
+            NS_DURING
+                [[_ratingMenu itemAtIndex:([mtr currentSongRating] * 5)] setState:NSOnState];
+            NS_HANDLER
+                [[MainController sharedController] networkError:localException];
+            NS_ENDHANDLER
+        } else if ([nextObject isEqualToString:@"upcomingSongs"]) {
+            ITDebugLog(@"Add \"Upcoming Songs\" submenu.");
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"upcomingSongs", @"Upcoming Songs")
+                    action:nil
+                    keyEquivalent:@""];
+            [tempItem setSubmenu:_upcomingSongsMenu];
+            [tempItem setTag:2];
+            if (_playingRadio || !_currentPlaylist) {
+                [tempItem setEnabled:NO];
+            }
+        } else if ([nextObject isEqualToString:@"artists"]) {
+            ITDebugLog(@"Add \"Artists\" submenu.");
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"artists", @"Artists")
+                    action:nil
+                    keyEquivalent:@""];
+            [tempItem setSubmenu:_artistsMenu];
+            [tempItem setTag:5];
+        } else if ([nextObject isEqualToString:@"albums"]) {
+            ITDebugLog(@"Add \"Albums\" submenu.");
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"albums", @"Albums")
+                    action:nil
+                    keyEquivalent:@""];
+            [tempItem setSubmenu:_albumsMenu];
+            [tempItem setTag:6];

         }
         }

+    }

     ITDebugLog(@"Finished building menu.");
     [_currentMenu release];
     _currentMenu = menu;
     ITDebugLog(@"Finished building menu.");
     [_currentMenu release];
     _currentMenu = menu;


@@ -398,7 +472,7 @@
 - (NSMenu *)menuForNoPlayer
 {
     NSMenu *menu = [[NSMenu alloc] initWithTitle:@""];
 - (NSMenu *)menuForNoPlayer
 {
     NSMenu *menu = [[NSMenu alloc] initWithTitle:@""];

-    NSMenuItem *tempItem;
+    id <NSMenuItem> tempItem = nil;

     ITDebugLog(@"Creating menu for when player isn't running.");
     NS_DURING
         ITDebugLog(@"Add \"Open %@\" menu item.", [[[MainController sharedController] currentRemote] playerSimpleName]);
     ITDebugLog(@"Creating menu for when player isn't running.");
     NS_DURING
         ITDebugLog(@"Add \"Open %@\" menu item.", [[[MainController sharedController] currentRemote] playerSimpleName]);


@@ -427,30 +501,61 @@
     return [menu autorelease];
 }
 
     return [menu autorelease];
 }
 

-- (void)rebuildSubmenus
+- (BOOL)rebuildSubmenus

 {
 {

+    NSArray *menu = [[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"];

     ITDebugLog(@"Rebuilding all of the submenus.");
     ITDebugLog(@"Rebuilding all of the submenus.");

-    

     NS_DURING
     NS_DURING

-        _currentPlaylist = [[[MainController sharedController] currentRemote] currentPlaylistIndex];
-        _currentTrack = [[[MainController sharedController] currentRemote] currentSongIndex];
+               _currentTrack = [[[MainController sharedController] currentRemote] currentSongIndex];
+               if (_currentTrack > -1) {
+                       _currentPlaylist = [[[MainController sharedController] currentRemote] currentPlaylistIndex];
+               }

         _playingRadio = ([[[MainController sharedController] currentRemote] currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist);
     NS_HANDLER
         [[MainController sharedController] networkError:localException];
     NS_ENDHANDLER
         _playingRadio = ([[[MainController sharedController] currentRemote] currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist);
     NS_HANDLER
         [[MainController sharedController] networkError:localException];
     NS_ENDHANDLER

+    ITDebugLog(@"Releasing old submenus.");
+       _continue = YES;
+    ITDebugLog(@" - Rating menu");

     [_ratingMenu release];
     [_ratingMenu release];

+       _ratingMenu = nil;
+    ITDebugLog(@" - Upcoming songs menu");

     [_upcomingSongsMenu release];
     [_upcomingSongsMenu release];

+       _upcomingSongsMenu = nil;
+    ITDebugLog(@" - Playlists menu");

     [_playlistsMenu release];
     [_playlistsMenu release];

+       _playlistsMenu = nil;
+    ITDebugLog(@" - EQ menu");

     [_eqMenu release];
     [_eqMenu release];

+       _eqMenu = nil;
+    

     ITDebugLog(@"Beginning Rebuild of \"Song Rating\" submenu.");
     _ratingMenu = [self ratingMenu];
     ITDebugLog(@"Beginning Rebuild of \"Upcoming Songs\" submenu.");
     _upcomingSongsMenu = [self upcomingSongsMenu];
     ITDebugLog(@"Beginning Rebuild of \"Song Rating\" submenu.");
     _ratingMenu = [self ratingMenu];
     ITDebugLog(@"Beginning Rebuild of \"Upcoming Songs\" submenu.");
     _upcomingSongsMenu = [self upcomingSongsMenu];

-    ITDebugLog(@"Beginning Rebuild of \"Playlists\" submenu.");
-    _playlistsMenu = [self playlistsMenu];
-    ITDebugLog(@"Beginning Rebuild of \"EQ Presets\" submenu.");
-    _eqMenu = [self eqMenu];
+       if (_continue) {
+               ITDebugLog(@"Beginning Rebuild of \"Playlists\" submenu.");
+               _playlistsMenu = [self playlistsMenu];
+       }
+       if (_continue) {
+               ITDebugLog(@"Beginning Rebuild of \"EQ Presets\" submenu.");
+               _eqMenu = [self eqMenu];
+       }
+    if (_continue && [menu containsObject:@"artists"]) {
+        ITDebugLog(@"Releasing artists menu");
+        [_artistsMenu release];
+        ITDebugLog(@"Beginning Rebuild of \"Artists\" submenu.");
+        _artistsMenu = [self artistsMenu];
+    }
+    
+    if (_continue && [menu containsObject:@"albums"]) {
+        ITDebugLog(@"Releasing albums menu");
+        [_albumsMenu release];
+        ITDebugLog(@"Beginning Rebuild of \"Albums\" submenu.");
+        _albumsMenu = [self albumsMenu];
+    }

     ITDebugLog(@"Done rebuilding all of the submenus.");
     ITDebugLog(@"Done rebuilding all of the submenus.");

+       return _continue;

 }
 
 - (NSMenu *)ratingMenu
 }
 
 - (NSMenu *)ratingMenu


@@ -484,29 +589,35 @@
 
 - (NSMenu *)upcomingSongsMenu
 {
 
 - (NSMenu *)upcomingSongsMenu
 {

-    NSMenu *upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""];
-    int numSongs, numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];
-    
+    NSMenu *upcomingSongsMenu;
+    int numSongs = 0, numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];
+       if (_currentTrack == -1) {
+               return nil;
+       }

     NS_DURING
         numSongs = [[[MainController sharedController] currentRemote] numberOfSongsInPlaylistAtIndex:_currentPlaylist];
     NS_HANDLER
         [[MainController sharedController] networkError:localException];
     NS_ENDHANDLER
     
     NS_DURING
         numSongs = [[[MainController sharedController] currentRemote] numberOfSongsInPlaylistAtIndex:_currentPlaylist];
     NS_HANDLER
         [[MainController sharedController] networkError:localException];
     NS_ENDHANDLER
     

+       if (numSongs == -1) {
+               return nil;
+       }
+       upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""];
+       NS_DURING

     ITDebugLog(@"Building \"Upcoming Songs\" menu.");
     if (_currentPlaylist && !_playingRadio) {
         if (numSongs > 0) {
             int i;
     ITDebugLog(@"Building \"Upcoming Songs\" menu.");
     if (_currentPlaylist && !_playingRadio) {
         if (numSongs > 0) {
             int i;

-

             for (i = _currentTrack + 1; i <= _currentTrack + numSongsInAdvance; i++) {
                 if (i <= numSongs) {
             for (i = _currentTrack + 1; i <= _currentTrack + numSongsInAdvance; i++) {
                 if (i <= numSongs) {

-                    NSString *curSong;
+                    NSString *curSong = nil;

                     NS_DURING
                         curSong = [[[MainController sharedController] currentRemote] songTitleAtIndex:i];
                     NS_HANDLER
                         [[MainController sharedController] networkError:localException];
                     NS_ENDHANDLER
                     NS_DURING
                         curSong = [[[MainController sharedController] currentRemote] songTitleAtIndex:i];
                     NS_HANDLER
                         [[MainController sharedController] networkError:localException];
                     NS_ENDHANDLER

-                    NSMenuItem *songItem;
+                    id <NSMenuItem> songItem;

                     ITDebugLog(@"Adding song: %@", curSong);
                     songItem = [upcomingSongsMenu addItemWithTitle:curSong action:@selector(performUpcomingSongsMenuAction:) keyEquivalent:@""];
                     [songItem setTag:i];
                     ITDebugLog(@"Adding song: %@", curSong);
                     songItem = [upcomingSongsMenu addItemWithTitle:curSong action:@selector(performUpcomingSongsMenuAction:) keyEquivalent:@""];
                     [songItem setTag:i];


@@ -522,14 +633,19 @@
         }
     }
     ITDebugLog(@"Done Building \"Upcoming Songs\" menu.");
         }
     }
     ITDebugLog(@"Done Building \"Upcoming Songs\" menu.");

-    return upcomingSongsMenu;
+       NS_VALUERETURN(upcomingSongsMenu, NSMenu *);
+       NS_HANDLER
+               [upcomingSongsMenu release];
+               _continue = NO;
+               NS_VALUERETURN(nil, NSMenu *);
+       NS_ENDHANDLER

 }
 
 /*- (NSMenu *)playlistsMenu
 {
     NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""];
     NSArray *playlists;
 }
 
 /*- (NSMenu *)playlistsMenu
 {
     NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""];
     NSArray *playlists;

-    NSMenuItem *tempItem;
+    id <NSMenuItem> tempItem;

     ITMTRemotePlayerSource source = [[[MainController sharedController] currentRemote] currentSource];
     int i;
     NS_DURING
     ITMTRemotePlayerSource source = [[[MainController sharedController] currentRemote] currentSource];
     int i;
     NS_DURING


@@ -565,73 +681,126 @@
     return playlistsMenu;
 }*/
 
     return playlistsMenu;
 }*/
 

+- (void)playlistsMenuAux:(NSMenu *)menu node:(PlaylistNode *)node tagPrefix:(int)p
+{
+       id <NSMenuItem> tempItem;
+       int i;
+       
+       for (i = 0; i < [[node children] count]; i++) {
+               PlaylistNode *nextNode = [[node children] objectAtIndex:i];
+               if ([nextNode type] == ITMTFolderNode) {
+                       NSMenu *submenu = [[NSMenu alloc] init];
+                       tempItem = [menu addItemWithTitle:[nextNode name] action:@selector(performPlaylistMenuAction:) keyEquivalent:@""];
+                       [tempItem setTag:p + [nextNode index] + 1];
+                       [tempItem setTarget:self];
+                       [tempItem setSubmenu:submenu];
+                       [self playlistsMenuAux:[submenu autorelease] node:nextNode tagPrefix:p];
+               } else {
+                       tempItem = [menu addItemWithTitle:[nextNode name] action:@selector(performPlaylistMenuAction:) keyEquivalent:@""];
+                       [tempItem setTag:p + [nextNode index] + 1];
+                       [tempItem setTarget:self];
+               }
+               
+               PlaylistNode *root = node;
+               while ([root type] == ITMTPlaylistNode || [root type] == ITMTFolderNode) {
+                       root = [root parent];
+               }
+               
+               if ([root index] == [[[MainController sharedController] currentRemote] currentSourceIndex] && [nextNode index] == _currentPlaylist) {
+                       [tempItem setState:NSOnState];
+               }
+       }
+}

 
 - (NSMenu *)playlistsMenu
 {
     NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""];
 
 - (NSMenu *)playlistsMenu
 {
     NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""];

-    NSArray *playlists;
-    NSMenuItem *tempItem;
+    NSArray *playlists = nil;
+    id <NSMenuItem> tempItem;

     ITMTRemotePlayerSource source = [[[MainController sharedController] currentRemote] currentSource];
     ITMTRemotePlayerSource source = [[[MainController sharedController] currentRemote] currentSource];

-    int i, j;
+       int i;
+    NSMutableArray *indices = [[NSMutableArray alloc] init];

     NS_DURING
         playlists = [[[MainController sharedController] currentRemote] playlists];
     NS_HANDLER
         [[MainController sharedController] networkError:localException];
     NS_ENDHANDLER
     NS_DURING
         playlists = [[[MainController sharedController] currentRemote] playlists];
     NS_HANDLER
         [[MainController sharedController] networkError:localException];
     NS_ENDHANDLER

+       
+       if (!playlists) {
+               [playlistsMenu release];
+               return nil;
+       }
+       NS_DURING

     ITDebugLog(@"Building \"Playlists\" menu.");
     {
     ITDebugLog(@"Building \"Playlists\" menu.");
     {

-        NSArray *curPlaylist = [playlists objectAtIndex:0];
-        NSString *name = [curPlaylist objectAtIndex:0];
-        ITDebugLog(@"Adding main source: %@", name);
-        for (i = 2; i < [curPlaylist count]; i++) {
-            ITDebugLog(@"Adding playlist: %@", [curPlaylist objectAtIndex:i]);
-            tempItem = [playlistsMenu addItemWithTitle:[curPlaylist objectAtIndex:i] action:@selector(performPlaylistMenuAction:) keyEquivalent:@""];
-            [tempItem setTag:i];
-            [tempItem setTarget:self];
-        }
+               //First we add the main Library source, since it is guaranteed to be there.
+        PlaylistNode *library = [playlists objectAtIndex:0];
+        ITDebugLog(@"Adding main source: %@", [library name]);
+               [self playlistsMenuAux:playlistsMenu node:library tagPrefix:0];
+        ITDebugLog(@"Adding index to the index array.");
+        [indices addObject:[NSNumber numberWithInt:[library index]]];

     }
     }

-    
-    if ( (source == ITMTRemoteRadioSource) || ([playlists count] - 2 > 0) ) {
-        [playlistsMenu addItem:[NSMenuItem separatorItem]];
-    }
-    
-    if (source == ITMTRemoteRadioSource) {
-        [[playlistsMenu addItemWithTitle:NSLocalizedString(@"radio", @"Radio") action:@selector(performPlaylistMenuAction:) keyEquivalent:@""] setState:NSOnState];
-    }
-    
-    for (i = 2; i < [playlists count]; i++) {
-        NSArray *curPlaylist = [playlists objectAtIndex:i];
-        NSString *name = [curPlaylist objectAtIndex:0];
-        NSMenu *submenu = [[NSMenu alloc] init];
-        ITDebugLog(@"Adding source: %@", name);
-        for (j = 2; j < [curPlaylist count]; j++) {
-            ITDebugLog(@"Adding playlist: %@", [curPlaylist objectAtIndex:j]);
-            tempItem = [submenu addItemWithTitle:[curPlaylist objectAtIndex:j] action:@selector(performPlaylistMenuAction:) keyEquivalent:@""];
-            [tempItem setTag:(i * 1000) + j];
-            [tempItem setTarget:self];
-            if ([[curPlaylist objectAtIndex:i] intValue] == ITMTRemoteiPodSource) {
-                [tempItem setEnabled:NO];
+       
+       //Next go through the other sources
+    if ([playlists count] > 1) {
+               //Add the radio source if it is playing
+        if ([[playlists objectAtIndex:1] sourceType] == ITMTRemoteRadioSource) {
+            [indices addObject:[NSNumber numberWithInt:[[playlists objectAtIndex:1] index]]];
+            if (source == ITMTRemoteRadioSource) {
+                [playlistsMenu addItem:[NSMenuItem separatorItem]];
+                [[playlistsMenu addItemWithTitle:NSLocalizedString(@"radio", @"Radio") action:@selector(performPlaylistMenuAction:) keyEquivalent:@""] setState:NSOnState];
+            } else if ([playlists count] > 2) {
+                               [playlistsMenu addItem:[NSMenuItem separatorItem]];
+                       }
+        }
+               
+               //Add other sources as needed (shared music, iPods, CDs)
+        for (i = [playlists count] - 1; i > 1 ; i--) {
+            PlaylistNode *nextSource = [playlists objectAtIndex:i];
+            if ([nextSource type] != ITMTRemoteRadioSource) {
+                NSString *name = [nextSource name];
+                ITDebugLog(@"Adding source: %@", name);
+                
+                if ( ([nextSource type] == ITMTRemoteiPodSource) && [self iPodWithNameAutomaticallyUpdates:name] ) {
+                    ITDebugLog(@"Invalid iPod source.");
+                    [playlistsMenu addItemWithTitle:name action:NULL keyEquivalent:@""];
+                } else {
+                                       NSMenu *menu = [[NSMenu alloc] init];
+                                       [[playlistsMenu addItemWithTitle:name action:NULL keyEquivalent:@""] setSubmenu:[menu autorelease]];
+                                       [self playlistsMenuAux:menu node:nextSource tagPrefix:(i * 1000)];
+                }
+                ITDebugLog(@"Adding index to the index array.");
+                [indices addObject:[NSNumber numberWithInt:[nextSource index]]];

             }
         }
             }
         }

-        [[playlistsMenu addItemWithTitle:name action:NULL keyEquivalent:@""] setSubmenu:[submenu autorelease]];
-    }
-    
-    if ( (source == ITMTRemoteSharedLibrarySource) || (source == ITMTRemoteiPodSource) || (source == ITMTRemoteGenericDeviceSource) || (source == ITMTRemoteCDSource) ){
-        tempItem = [playlistsMenu itemAtIndex:(int)[[[MainController sharedController] currentRemote] currentSourceIndex] + [playlistsMenu numberOfItems] - 5];
-        [tempItem setState:NSOnState];
-        [[[tempItem submenu] itemAtIndex:_currentPlaylist - 1] setState:NSOnState];
-    } else if (source == ITMTRemoteLibrarySource && _currentPlaylist) {
-        [[playlistsMenu itemAtIndex:_currentPlaylist - 1] setState:NSOnState];

     }
     }

+       NS_DURING
+       if (_currentPlaylist != -1) {
+               if ( (source == ITMTRemoteSharedLibrarySource) || (source == ITMTRemoteiPodSource) || (source == ITMTRemoteGenericDeviceSource) || (source == ITMTRemoteCDSource) ) {
+                       tempItem = [playlistsMenu itemAtIndex:[playlistsMenu numberOfItems] + [indices indexOfObject:[NSNumber numberWithInt:[[[MainController sharedController] currentRemote] currentSourceIndex]]] - [indices count]];
+                       [tempItem setState:NSOnState];
+               }
+       }
+       NS_HANDLER
+       NS_ENDHANDLER
+    [indices release];
+    tempItem = [playlistsMenu addItemWithTitle:NSLocalizedString(@"refresh", @"Refresh") action:@selector(rebuildSubmenus) keyEquivalent:@""];
+    [tempItem setTarget:self];
+    [tempItem setImage:[NSImage imageNamed:@"ChasingArrow"]];

     ITDebugLog(@"Done Building \"Playlists\" menu");
     ITDebugLog(@"Done Building \"Playlists\" menu");

-    return playlistsMenu;
+    NS_VALUERETURN(playlistsMenu, NSMenu *);
+       NS_HANDLER
+               [playlistsMenu release];
+               _continue = NO;
+               NS_VALUERETURN(nil, NSMenu *);
+       NS_ENDHANDLER

 }
 
 - (NSMenu *)eqMenu
 {
     NSMenu *eqMenu = [[NSMenu alloc] initWithTitle:@""];
 }
 
 - (NSMenu *)eqMenu
 {
     NSMenu *eqMenu = [[NSMenu alloc] initWithTitle:@""];

-    NSArray *eqPresets;
-    NSMenuItem *tempItem;
+    NSArray *eqPresets = nil;
+    id <NSMenuItem> tempItem;

     int i;
     
     NS_DURING
     int i;
     
     NS_DURING


@@ -642,6 +811,11 @@
     
     ITDebugLog(@"Building \"EQ Presets\" menu.");
     
     
     ITDebugLog(@"Building \"EQ Presets\" menu.");
     

+    tempItem = [eqMenu addItemWithTitle:@"Enabled" action:@selector(performEqualizerMenuAction:) keyEquivalent:@""];
+    [tempItem setTag:-1];
+    [tempItem setTarget:self];
+    [eqMenu addItem:[NSMenuItem separatorItem]];
+    

     for (i = 0; i < [eqPresets count]; i++) {
         NSString *name;
           if ( ( name = [eqPresets objectAtIndex:i] ) ) {
     for (i = 0; i < [eqPresets count]; i++) {
         NSString *name;
           if ( ( name = [eqPresets objectAtIndex:i] ) ) {


@@ -657,6 +831,46 @@
     return eqMenu;
 }
 
     return eqMenu;
 }
 

+- (NSMenu *)artistsMenu
+{
+    NSMenu *artistsMenu = [[NSMenu alloc] initWithTitle:@"Artists"];
+    NSEnumerator *artistsEnumerator;
+    NSString *nextArtist;
+    id <NSMenuItem> tempItem;
+    ITDebugLog(@"Building \"Artists\" menu.");
+    NS_DURING
+        artistsEnumerator = [[[[MainController sharedController] currentRemote] artists] objectEnumerator];
+        while ( (nextArtist = [artistsEnumerator nextObject]) ) {
+            tempItem = [artistsMenu addItemWithTitle:nextArtist action:@selector(performBrowseMenuAction:) keyEquivalent:@""];
+            [tempItem setTarget:self];
+        }
+    NS_HANDLER
+        [[MainController sharedController] networkError:localException];
+    NS_ENDHANDLER
+    ITDebugLog(@"Done Building \"Artists\" menu");
+    return artistsMenu;
+}
+
+- (NSMenu *)albumsMenu
+{
+    NSMenu *albumsMenu = [[NSMenu alloc] initWithTitle:@"Albums"];
+    NSEnumerator *albumsEnumerator;
+    NSString *nextAlbum;
+    id <NSMenuItem> tempItem;
+    ITDebugLog(@"Building \"Albums\" menu.");
+    NS_DURING
+        albumsEnumerator = [[[[MainController sharedController] currentRemote] albums] objectEnumerator];
+        while ( (nextAlbum = [albumsEnumerator nextObject]) ) {
+            tempItem = [albumsMenu addItemWithTitle:nextAlbum action:@selector(performBrowseMenuAction:) keyEquivalent:@""];
+            [tempItem setTarget:self];
+        }
+    NS_HANDLER
+        [[MainController sharedController] networkError:localException];
+    NS_ENDHANDLER
+    ITDebugLog(@"Done Building \"Albums\" menu");
+    return albumsMenu;
+}
+

 - (void)performMainMenuAction:(id)sender
 {
     switch ( [sender tag] )
 - (void)performMainMenuAction:(id)sender
 {
     switch ( [sender tag] )


@@ -689,6 +903,10 @@
             ITDebugLog(@"Performing Menu Action: Preferences...");
             [[MainController sharedController] showPreferences];
             break;
             ITDebugLog(@"Performing Menu Action: Preferences...");
             [[MainController sharedController] showPreferences];
             break;

+               case MTMenuAboutItem:
+                       ITDebugLog(@"Performing Menu Action: About MenuTunes...");
+                       [[ITAboutWindowController sharedController] showAboutWindow];
+                       break;

         case MTMenuQuitItem:
             ITDebugLog(@"Performing Menu Action: Quit");
             [[MainController sharedController] quitMenuTunes];
         case MTMenuQuitItem:
             ITDebugLog(@"Performing Menu Action: Quit");
             [[MainController sharedController] quitMenuTunes];


@@ -727,6 +945,17 @@
     [[MainController sharedController] selectSongAtIndex:[sender tag]];
 }
 
     [[MainController sharedController] selectSongAtIndex:[sender tag]];
 }
 

+- (void)performBrowseMenuAction:(id)sender
+{
+    ITDebugLog(@"Browse action selected on item named %@", [sender title]);
+    /*
+    ** 1 - Artist
+    ** 2 - Album
+    ** 3 - Genre?
+    */
+    [[MainController sharedController] makePlaylistWithTerm:[sender title] ofType:(([[[sender menu] title] isEqualToString:@"Artists"]) ? 1 : 2)];
+}
+

 - (void)updateMenu
 {
     ITDebugLog(@"Update Menu");
 - (void)updateMenu
 {
     ITDebugLog(@"Update Menu");


@@ -759,7 +988,7 @@
 }
 
 - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
 }
 
 - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers

-        onItem:(NSMenuItem *)item
+        onItem:(id <NSMenuItem>)item

 {
     unichar charcode = 'a';
     int i;
 {
     unichar charcode = 'a';
     int i;


@@ -978,4 +1207,40 @@
     ITDebugLog(@"Done setting key equivalent on menu item: %@", [item title]);
 }
 
     ITDebugLog(@"Done setting key equivalent on menu item: %@", [item title]);
 }
 

+- (BOOL)iPodWithNameAutomaticallyUpdates:(NSString *)name
+{
+    NSArray *volumes = [[NSWorkspace sharedWorkspace] mountedLocalVolumePaths];
+    NSEnumerator *volEnum = [volumes objectEnumerator];
+    NSString *nextVolume;
+    ITDebugLog(@"Looking for an iPod named %@", name);
+    while ( (nextVolume = [volEnum nextObject]) ) {
+        ITDebugLog(@"- %@", nextVolume);
+        if ([nextVolume rangeOfString:name options:nil /*range:NSMakeRange(0, [name length] - 1)*/].location != NSNotFound) {
+            NSFileHandle *handle;
+            NSData *data;
+            NSString *path = [nextVolume stringByAppendingPathComponent:@"/iPod_Control/iTunes/iTunesPrefs"];
+            if ( ![[NSFileManager defaultManager] fileExistsAtPath:path] ) {
+                ITDebugLog(@"Error, path isn't an iPod! %@", path);
+                return NO;
+            }
+            handle = [NSFileHandle fileHandleForReadingAtPath:path];
+            ITDebugLog(@"File handle: %@", handle);
+            [handle seekToFileOffset:10];
+            data = [handle readDataOfLength:1];
+            ITDebugLog(@"Data: %@", data);
+            if ( (*((unsigned char*)[data bytes]) == 0x00) ) {
+                ITDebugLog(@"iPod is manually updated. %@", path);
+                return NO;
+            } else if ( ( *((unsigned char*)[data bytes]) == 0x01 ) ) {
+                ITDebugLog(@"iPod is automatically updated. %@", path);
+                return YES;
+            } else {
+                ITDebugLog(@"Error! Value: %h  Desc: %@ Path: %@", *((unsigned char*)[data bytes]), [data description], path);
+                return NO;
+            }
+        }
+    }
+    return YES;
+}
+

 @end
\ No newline at end of file
 @end
\ No newline at end of file