Reverting ITMTRemote to 1.24, which is prior to the API change :)
[MenuTunes.git] / OldMainController.m
index 7dc107d..dab1899 100755 (executable)
@@ -11,7 +11,6 @@
 - (void)updateRatingMenu;
 - (void)setupHotKeys;
 - (void)timerUpdate;
 - (void)updateRatingMenu;
 - (void)setupHotKeys;
 - (void)timerUpdate;
-- (void)updateMenu;
 - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
         onItem:(NSMenuItem *)item;
 
 - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
         onItem:(NSMenuItem *)item;
 
@@ -48,8 +47,8 @@
 
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
 
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     currentRemote = [self loadRemote];
     currentRemote = [self loadRemote];
-    [currentRemote begin];
     
     //Setup for notification of the remote player launching or quitting
     [[[NSWorkspace sharedWorkspace] notificationCenter]
     
     //Setup for notification of the remote player launching or quitting
     [[[NSWorkspace sharedWorkspace] notificationCenter]
             selector:@selector(applicationLaunched:)
             name:NSWorkspaceDidLaunchApplicationNotification
             object:nil];
             selector:@selector(applicationLaunched:)
             name:NSWorkspaceDidLaunchApplicationNotification
             object:nil];
-    
-    [self registerDefaults];
+
+    if ( ! [defaults objectForKey:@"menu"] ) {  // If this is nil, defaults have never been registered.
+        [[PreferencesController sharedPrefs] registerDefaults];
+    }
     
     statusItem = [[ITStatusItem alloc]
             initWithStatusBar:[NSStatusBar systemStatusBar]
     
     statusItem = [[ITStatusItem alloc]
             initWithStatusBar:[NSStatusBar systemStatusBar]
 - (void)applicationLaunched:(NSNotification *)note
 {
     if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
 - (void)applicationLaunched:(NSNotification *)note
 {
     if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
+        [currentRemote begin];
+        [self timerUpdate];
         [NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
         [NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
-        
-        [self rebuildMenu];
-        [statusItem setMenu:menu];
         [self setupHotKeys];
         isAppRunning = ITMTRemotePlayerRunning;
         [self setupHotKeys];
         isAppRunning = ITMTRemotePlayerRunning;
-        return;
     }
     }
-    
-    isAppRunning = ITMTRemotePlayerRunning;
 }
 
 - (void)applicationTerminated:(NSNotification *)note
 {
 }
 
 - (void)applicationTerminated:(NSNotification *)note
 {
-    if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {        
+    if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
         NSMenu *notRunningMenu = [[NSMenu alloc] initWithTitle:@""];
         NSMenu *notRunningMenu = [[NSMenu alloc] initWithTitle:@""];
-        [[notRunningMenu addItemWithTitle:[NSString stringWithFormat:@"Open %@", [currentRemote playerSimpleName]] action:@selector(showPlayer:) keyEquivalent:@""] setTarget:self];
+        [notRunningMenu addItemWithTitle:[NSString stringWithFormat:@"Open %@", [currentRemote playerSimpleName]] action:@selector(showPlayer:) keyEquivalent:@""];
         [notRunningMenu addItem:[NSMenuItem separatorItem]];
         [notRunningMenu addItem:[NSMenuItem separatorItem]];
-        [[notRunningMenu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
-        [[notRunningMenu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
+        [notRunningMenu addItemWithTitle:@"Preferences..." action:@selector(showPreferences:) keyEquivalent:@""];
+        [[notRunningMenu addItemWithTitle:@"Quit" action:@selector(terminate:) keyEquivalent:@""] setTarget:NSApp];
         [statusItem setMenu:[notRunningMenu autorelease]];
         
         [statusItem setMenu:[notRunningMenu autorelease]];
         
+        [currentRemote halt];
         [refreshTimer invalidate];
         [refreshTimer release];
         refreshTimer = nil;
         [self clearHotKeys];
         [refreshTimer invalidate];
         [refreshTimer release];
         refreshTimer = nil;
         [self clearHotKeys];
-        isAppRunning = NO;
-        return;
+        isAppRunning = ITMTRemotePlayerNotRunning;
     }
 }
 
     }
 }
 
 #pragma mark INSTANCE METHODS
 /*************************************************************************/
 
 #pragma mark INSTANCE METHODS
 /*************************************************************************/
 
-- (void)registerDefaults
-{
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    if (![defaults objectForKey:@"menu"]) {
-        BOOL found = NO;
-        NSMutableDictionary *loginwindow;
-        NSMutableArray *loginarray;
-        int i;
-        
-        [defaults setObject:
-            [NSArray arrayWithObjects:
-                @"Play/Pause",
-                @"Next Track",
-                @"Previous Track",
-                @"Fast Forward",
-                @"Rewind",
-                @"<separator>",
-                @"Upcoming Songs",
-                @"Playlists",
-                @"Song Rating",
-                @"<separator>",
-                @"PreferencesÉ",
-                @"Quit",
-                @"<separator>",
-                @"Current Track Info",
-                nil] forKey:@"menu"];
-        
-        [defaults synchronize];
-        loginwindow = [[defaults persistentDomainForName:@"loginwindow"] mutableCopy];
-        loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
-        
-        for (i = 0; i < [loginarray count]; i++) {
-            NSDictionary *tempDict = [loginarray objectAtIndex:i];
-            if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:
-                [[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
-                found = YES;
-            }
-        }
-        
-        //
-        //This is teh sux
-        //We must fix it so it is no longer suxy
-        if (!found) {
-            if (NSRunInformationalAlertPanel(@"Auto-launch MenuTunes", @"Would you like MenuTunes to automatically launch at login?", @"Yes", @"No", nil) == NSOKButton) {
-                AEDesc scriptDesc, resultDesc;
-                NSString *script = [NSString stringWithFormat:@"tell application \"System Events\"\nmake new login item at end of login items with properties {path:\"%@\", kind:\"APPLICATION\"}\nend tell", [[NSBundle mainBundle] bundlePath]];
-                ComponentInstance asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
-                
-                AECreateDesc(typeChar, [script cString], [script cStringLength], 
-            &scriptDesc);
-                
-                OSADoScript(asComponent, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc);
-                
-                AEDisposeDesc(&scriptDesc);
-                AEDisposeDesc(&resultDesc);
-                
-                CloseComponent(asComponent);
-            }
-        }
-    }
-    
-    if (![defaults integerForKey:@"SongsInAdvance"])
-    {
-        [defaults setInteger:5 forKey:@"SongsInAdvance"];
-    }
-    
-    if (![defaults objectForKey:@"showName"]) {
-        [defaults setBool:YES forKey:@"showName"];
-    }
-    
-    if (![defaults objectForKey:@"showArtist"]) {
-        [defaults setBool:YES forKey:@"showArtist"];
-    }
-    
-    if (![defaults objectForKey:@"showAlbum"]) {
-        [defaults setBool:NO forKey:@"showAlbum"];
-    }
-    
-    if (![defaults objectForKey:@"showTime"]) {
-        [defaults setBool:NO forKey:@"showTime"];
-    }
-}
-
 - (void)startTimerInNewThread
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 - (void)startTimerInNewThread
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 //Recreate the status item menu
 - (void)rebuildMenu
 {
 //Recreate the status item menu
 - (void)rebuildMenu
 {
-    NSArray *myMenu = [[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"];
+    NSUserDefaults *defaults;
+    NSArray *myMenu;
+    int playlist;
     int i;
     int i;
+    unichar fullstar = 0x2605;
+    unichar emptystar = 0x2606;
+    NSString *fullStarChar;
+    NSString *emptyStarChar;
+    
+    if ([currentRemote playerRunningState] == ITMTRemotePlayerNotRunning) {
+        return;
+    }
+    
+    defaults = [NSUserDefaults standardUserDefaults];
+    myMenu = [defaults arrayForKey:@"menu"];
+    playlist = [currentRemote currentPlaylistIndex];
+    fullStarChar = [NSString stringWithCharacters:&fullstar length:1];
+    emptyStarChar = [NSString stringWithCharacters:&emptystar length:1];
     
     trackInfoIndex = -1;
     lastPlaylistIndex = -1;
     
     trackInfoIndex = -1;
     lastPlaylistIndex = -1;
-    didHaveAlbumName = ([[currentRemote currentSongAlbum] length] > 0);
-    didHaveArtistName = ([[currentRemote currentSongArtist] length] > 0);
     
     
-    [menu autorelease];
+    [menu release];
     menu = [[NSMenu alloc] initWithTitle:@""];
     
     menu = [[NSMenu alloc] initWithTitle:@""];
     
-    /*while ([menu numberOfItems] > 0) {
-        [menu removeItemAtIndex:0];
-    }*/
-    
+    //Release the old submenus
     playPauseItem = nil;
     playPauseItem = nil;
-    lastSongIdentifier = @"0-0";
-    
     upcomingSongsItem = nil;
     [upcomingSongsMenu release];
     upcomingSongsMenu = nil;
     upcomingSongsItem = nil;
     [upcomingSongsMenu release];
     upcomingSongsMenu = nil;
-    
-    ratingItem = nil;
-    [ratingMenu release];
-    ratingMenu = nil;
-    
     playlistItem = nil;
     [playlistMenu release];
     playlistMenu = nil;
     playlistItem = nil;
     [playlistMenu release];
     playlistMenu = nil;
-    
     eqItem = nil;
     [eqMenu release];
     eqMenu = nil;
     eqItem = nil;
     [eqMenu release];
     eqMenu = nil;
+    if (ratingItem) {
+        [ratingItem setSubmenu:nil];
+        [ratingItem release];
+        ratingItem = nil;
+    }
+    
+    //Build the rating menu
+    [ratingMenu release];
+    ratingMenu = [[NSMenu alloc] initWithTitle:@""];
+    [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:0];
+    [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:20];
+    [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:40];
+    [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:60];
+    [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:80];
+    [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, fullStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:100];
     
     
+    //Build the custom menu
     for (i = 0; i < [myMenu count]; i++) {
         NSString *item = [myMenu objectAtIndex:i];
         if ([item isEqualToString:@"Play/Pause"]) {
     for (i = 0; i < [myMenu count]; i++) {
         NSString *item = [myMenu objectAtIndex:i];
         if ([item isEqualToString:@"Play/Pause"]) {
             [menu addItemWithTitle:@"Rewind"
                     action:@selector(rewind:)
                     keyEquivalent:@""];
             [menu addItemWithTitle:@"Rewind"
                     action:@selector(rewind:)
                     keyEquivalent:@""];
+        } else if ([item isEqualToString:@"Show Player"]) {
+            [menu addItemWithTitle:[NSString stringWithFormat:@"Show %@", [currentRemote playerSimpleName]]
+                    action:@selector(showPlayer:)
+                    keyEquivalent:@""];
         } else if ([item isEqualToString:@"Upcoming Songs"]) {
             upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs"
                     action:nil
                     keyEquivalent:@""];
         } else if ([item isEqualToString:@"Upcoming Songs"]) {
             upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs"
                     action:nil
                     keyEquivalent:@""];
+            upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""];
+            [upcomingSongsItem setSubmenu:upcomingSongsMenu];
+            [upcomingSongsItem setEnabled:NO];
         } else if ([item isEqualToString:@"Playlists"]) {
             playlistItem = [menu addItemWithTitle:@"Playlists"
                     action:nil
         } else if ([item isEqualToString:@"Playlists"]) {
             playlistItem = [menu addItemWithTitle:@"Playlists"
                     action:nil
             eqItem = [menu addItemWithTitle:@"EQ Presets"
                     action:nil
                     keyEquivalent:@""];
             eqItem = [menu addItemWithTitle:@"EQ Presets"
                     action:nil
                     keyEquivalent:@""];
-        } else if ([item isEqualToString:@"PreferencesÉ"]) {
-            [menu addItemWithTitle:@"PreferencesÉ"
+        } else if ([item isEqualToString:@"Preferences"]) {
+            [menu addItemWithTitle:@"Preferences"
                     action:@selector(showPreferences:)
                     keyEquivalent:@""];
         } else if ([item isEqualToString:@"Quit"]) {
                     action:@selector(showPreferences:)
                     keyEquivalent:@""];
         } else if ([item isEqualToString:@"Quit"]) {
-            [menu addItemWithTitle:@"Quit"
-                    action:@selector(quitMenuTunes:)
-                    keyEquivalent:@""];
+            [[menu addItemWithTitle:@"Quit"
+                    action:@selector(terminate:)
+                    keyEquivalent:@""] setTarget:NSApp];
         } else if ([item isEqualToString:@"Current Track Info"]) {
             trackInfoIndex = [menu numberOfItems];
             [menu addItemWithTitle:@"No Song"
                     action:nil
                     keyEquivalent:@""];
         } else if ([item isEqualToString:@"Song Rating"]) {
         } else if ([item isEqualToString:@"Current Track Info"]) {
             trackInfoIndex = [menu numberOfItems];
             [menu addItemWithTitle:@"No Song"
                     action:nil
                     keyEquivalent:@""];
         } else if ([item isEqualToString:@"Song Rating"]) {
-            unichar fullstar = 0x2605;
-            unichar emptystar = 0x2606;
-            NSString *fullStarChar = [NSString stringWithCharacters:&fullstar length:1];
-            NSString *emptyStarChar = [NSString stringWithCharacters:&emptystar length:1];
-            NSMenuItem *item;
-            
-            ratingItem = [menu addItemWithTitle:@"Song Rating"
+            ratingItem = [[menu addItemWithTitle:@"Song Rating"
                     action:nil
                     action:nil
-                    keyEquivalent:@""];
-            
-            ratingMenu = [[NSMenu alloc] initWithTitle:@""];
-            
-            item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
-            [item setTag:0];
-            
-            item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
-            [item setTag:20];
+                    keyEquivalent:@""] retain];
+            [ratingItem setSubmenu:ratingMenu];
+        } else if ([item isEqualToString:@"<separator>"]) {
+            [menu addItem:[NSMenuItem separatorItem]];
+        }
+    }
+    
+    if (playlistItem) {
+        [self rebuildPlaylistMenu];
+    }
+    
+    if (eqItem) {
+        [self rebuildEQPresetsMenu];
+    }
+    
+    isPlayingRadio = ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist);
+    
+    if (upcomingSongsItem) {
+        [self rebuildUpcomingSongsMenu];
+    }
+    
+    if (ratingItem) {
+        if (isPlayingRadio || !playlist) {
+            [ratingItem setEnabled:NO];
+        } else {
+            int currentSongRating = ([currentRemote currentSongRating] * 5);
+            lastSongRating = currentSongRating;
+            [[ratingMenu itemAtIndex:lastSongRating] setState:NSOnState];
+            [ratingItem setEnabled:YES];
+        }
+    }
+    
+    //Set the new unique song identifier
+    lastSongIdentifier = [[currentRemote currentSongUniqueIdentifier] retain];
+    
+    //If we're in a playlist or radio mode
+    if ( ![lastSongIdentifier isEqualToString:@"0-0"] && (trackInfoIndex > -1) ) {
+        NSString *title;
+        
+        if ( (i = [menu indexOfItemWithTitle:@"No Song"]) ) {
+            if ( (i > -1) ) {
+                [menu removeItemAtIndex:i];
+                [menu insertItemWithTitle:@"Now Playing" action:NULL keyEquivalent:@"" atIndex:i];
+            }
+        }
+        
+        title = [currentRemote currentSongTitle];
+        
+        if (!isPlayingRadio) {
+            if ([defaults boolForKey:@"showTime"]) {
+                NSString *length = [currentRemote currentSongLength];
+                char character = [length characterAtIndex:0];
+                if ( (character > '0') && (character < '9') ) {
+                    [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", [currentRemote currentSongLength]] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+                }
+            }
             
             
-            item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
-            [item setTag:40];
+            if ([defaults boolForKey:@"showTrackRating"]) {
+                if (title) { //Check to see if there's a song playing
+                [menu insertItemWithTitle:[NSString stringWithFormat:@"         %@", [[ratingMenu itemAtIndex:[currentRemote currentSongRating] * 5] title]] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+                }
+            }
             
             
-            item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
-            [item setTag:60];
+            if ([defaults boolForKey:@"showArtist"]) {
+                NSString *artist = [currentRemote currentSongArtist];
+                if ([artist length] > 0) {
+                    [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", artist] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+                }
+            }
             
             
-            item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
-            [item setTag:80];
+            if ([defaults boolForKey:@"showTrackNumber"]) {
+                int track = [currentRemote currentSongTrack];
+                int total = [currentRemote currentAlbumTrackCount];
+                if (total > 0) {
+                    [menu insertItemWithTitle:[NSString stringWithFormat:@"  Track %i of %i", track, total] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+                }
+            }
             
             
-            item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, fullStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
-            [item setTag:100];
-        } else if ([item isEqualToString:@"<separator>"]) {
-            [menu addItem:[NSMenuItem separatorItem]];
+            if ([defaults boolForKey:@"showAlbum"]) {
+                NSString *album = [currentRemote currentSongAlbum];
+                if ([album length] > 0) {
+                    [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", album] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+                }
+            }
+        }
+        
+        if ([title length] > 0) {
+            [menu insertItemWithTitle:[NSString stringWithFormat:@"     %@", title] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
         }
     }
     
     [statusItem setMenu:menu];
     
         }
     }
     
     [statusItem setMenu:menu];
     
-    [self updateMenu];
-    
     [self clearHotKeys];
     [self setupHotKeys];
 }
     [self clearHotKeys];
     [self setupHotKeys];
 }
 - (void)rebuildEQPresetsMenu
 {
     NSArray *eqPresets = [currentRemote eqPresets];
 - (void)rebuildEQPresetsMenu
 {
     NSArray *eqPresets = [currentRemote eqPresets];
-    NSMenuItem *enabledItem;
     int i;
     
     int i;
     
-    [eqMenu release];
+    [eqMenu autorelease];
     eqMenu = [[NSMenu alloc] initWithTitle:@""];
     
     eqMenu = [[NSMenu alloc] initWithTitle:@""];
     
-    enabledItem = [eqMenu addItemWithTitle:@"Enabled"
-                          action:@selector(selectEQPreset:)
-                          keyEquivalent:@""];
-    [enabledItem setTag:-1];
-    
-    if ([currentRemote equalizerEnabled]) {
-        [enabledItem setState:NSOnState];
-    }
-    
-    [eqMenu addItem:[NSMenuItem separatorItem]];
-    
     for (i = 0; i < [eqPresets count]; i++) {
     for (i = 0; i < [eqPresets count]; i++) {
-        NSString *name = [eqPresets objectAtIndex:i];
+        NSString *name;
         NSMenuItem *tempItem;
         NSMenuItem *tempItem;
-       if (name) {
+       if ( ( name = [eqPresets objectAtIndex:i] ) ) {
             tempItem = [[NSMenuItem alloc] initWithTitle:name action:@selector(selectEQPreset:) keyEquivalent:@""];
             [tempItem setTag:i];
             [eqMenu addItem:tempItem];
             tempItem = [[NSMenuItem alloc] initWithTitle:name action:@selector(selectEQPreset:) keyEquivalent:@""];
             [tempItem setTag:i];
             [eqMenu addItem:tempItem];
-            [tempItem release];
+            [tempItem autorelease];
        }
     }
        }
     }
+    
     [eqItem setSubmenu:eqMenu];
     [eqItem setEnabled:YES];
     [eqItem setSubmenu:eqMenu];
     [eqItem setEnabled:YES];
-    
-    [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex] + 1] setState:NSOnState];
+    [[eqMenu itemAtIndex:([currentRemote currentEQPresetIndex] - 1)] setState:NSOnState];
 }
 
 - (void)updateRatingMenu
 {
     int currentSongRating = ([currentRemote currentSongRating] * 5);
     if ([currentRemote currentPlaylistIndex] && (currentSongRating != lastSongRating)) {
 }
 
 - (void)updateRatingMenu
 {
     int currentSongRating = ([currentRemote currentSongRating] * 5);
     if ([currentRemote currentPlaylistIndex] && (currentSongRating != lastSongRating)) {
-        if ([currentRemote classOfPlaylistAtIndex:[currentRemote currentPlaylistIndex]] == ITMTRemotePlayerRadioPlaylist) {
+        if ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist) {
             return;
         }
         [[ratingMenu itemAtIndex:lastSongRating] setState:NSOffState];
             return;
         }
         [[ratingMenu itemAtIndex:lastSongRating] setState:NSOffState];
 {
     NSString *currentIdentifier = [currentRemote currentSongUniqueIdentifier];
     if (![lastSongIdentifier isEqualToString:currentIdentifier] ||
 {
     NSString *currentIdentifier = [currentRemote currentSongUniqueIdentifier];
     if (![lastSongIdentifier isEqualToString:currentIdentifier] ||
-       (!isPlayingRadio && ([currentRemote classOfPlaylistAtIndex:[currentRemote currentPlaylistIndex]] == ITMTRemotePlayerRadioPlaylist))) {
+       (!isPlayingRadio && ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist))) {
+        //
+        //
+        // If we want to show the new track floater, do it here!
+        //[self showCurrentTrackInfoStatusWindow];
+        //
+        //
         [self rebuildMenu];
     }
     
         [self rebuildMenu];
     }
     
     
     //Update Play/Pause menu item
     if (playPauseItem){
     
     //Update Play/Pause menu item
     if (playPauseItem){
+        //
+        //
+        // If we want to show the song played/paused, show it here!
+        //
+        //
         if ([currentRemote playerPlayingState] == ITMTRemotePlayerPlaying) {
             [playPauseItem setTitle:@"Pause"];
         } else {
         if ([currentRemote playerPlayingState] == ITMTRemotePlayerPlaying) {
             [playPauseItem setTitle:@"Pause"];
         } else {
     }
 }
 
     }
 }
 
-- (void)updateMenu
-{
-    NSUserDefaults *defaults;
-    int playlist = [currentRemote currentPlaylistIndex];
-    int temp;
-    
-    if ( (isAppRunning == ITMTRemotePlayerNotRunning) ) {
-        return;
-    }
-    
-    defaults = [NSUserDefaults standardUserDefaults];
-    isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist);
-    
-    if (upcomingSongsItem) {
-        [self rebuildUpcomingSongsMenu];
-    }
-    
-    if (playlistItem) {
-        [self rebuildPlaylistMenu];
-    }
-    
-    if (eqItem) {
-        [self rebuildEQPresetsMenu];
-    }
-    
-    if (ratingItem) {
-        if (isPlayingRadio || !playlist) {
-            [ratingItem setEnabled:NO];
-            if ([ratingItem submenu]) {
-                [ratingItem setSubmenu:nil];
-            }
-        } else {
-            int currentSongRating = ([currentRemote currentSongRating] * 5);
-            [[ratingMenu itemAtIndex:lastSongRating] setState:NSOffState];
-            lastSongRating = currentSongRating;
-            [[ratingMenu itemAtIndex:lastSongRating] setState:NSOnState];
-            [ratingItem setEnabled:YES];
-            [ratingItem setSubmenu:ratingMenu];
-        }
-    }
-    
-    //Set the new unique song identifier
-    lastSongIdentifier = [[currentRemote currentSongUniqueIdentifier] retain];
-    
-    //If we're in a playlist or radio mode
-    if ( (trackInfoIndex > -1) && (playlist || isPlayingRadio) ) {
-        NSString *title, *album, *artist;
-        
-        if ( (temp = [menu indexOfItemWithTitle:@"No Song"]) && (temp > -1) ) {
-            [menu removeItemAtIndex:temp];
-            [menu insertItemWithTitle:@"Now Playing" action:NULL keyEquivalent:@"" atIndex:temp];
-        }
-        
-        title = [currentRemote currentSongTitle];
-        
-        if (!isPlayingRadio) {
-            ([defaults boolForKey:@"showAlbum"]) ? (album = [currentRemote currentSongAlbum]) :
-                                                   (album = @"");
-            ([defaults boolForKey:@"showArtist"]) ? (artist = [currentRemote currentSongArtist]) :
-                                                    (artist = @"");
-            if ([defaults boolForKey:@"showTime"]) {
-                [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", [currentRemote currentSongLength]] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
-            }
-            
-            if ([artist length] > 0) {
-                [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", artist] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
-            }
-            
-            if ([album length] > 0) {
-                [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", album] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
-            }
-            
-            if ([defaults boolForKey:@"showArtist"]) {
-                didHaveArtistName = (([artist length] > 0) ? YES : NO);
-            }
-            
-            if ([defaults boolForKey:@"showAlbum"]) {
-                didHaveAlbumName = (([album length] > 0) ? YES : NO);
-            }
-        }
-        
-        if ([title length] > 0) {
-            [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", title] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
-        }
-    }
-    [menu update];
-}
-
-
 //
 //
 // Menu Selectors
 //
 //
 // Menu Selectors
     int curSet = [currentRemote currentEQPresetIndex];
     int item = [sender tag];
     
     int curSet = [currentRemote currentEQPresetIndex];
     int item = [sender tag];
     
-    if (item == -1) {
-        [currentRemote setEqualizerEnabled:![currentRemote equalizerEnabled]];
-    } else {
-        [currentRemote setEqualizerEnabled:YES];
-        [currentRemote switchToEQAtIndex:item];
-        [[eqMenu itemAtIndex:curSet + 1] setState:NSOffState];
-        [[eqMenu itemAtIndex:item + 2] setState:NSOnState];
-    }
+    [currentRemote switchToEQAtIndex:item];
+    [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState];
+    [[eqMenu itemAtIndex:item] setState:NSOnState];
 }
 
 - (void)selectSongRating:(id)sender
 }
 
 - (void)selectSongRating:(id)sender
 
 //
 //
 
 //
 //
-- (void)quitMenuTunes:(id)sender
-{
-    [NSApp terminate:self];
-}
 
 - (void)showPlayer:(id)sender
 {
 
 - (void)showPlayer:(id)sender
 {
 
 - (void)showPreferences:(id)sender
 {
 
 - (void)showPreferences:(id)sender
 {
-    if (!prefsController) {
-        prefsController = [[PreferencesController alloc] initWithMenuTunes:self];
-        [self clearHotKeys];
-    }
+    [[PreferencesController sharedPrefs] setController:self];
+    [[PreferencesController sharedPrefs] showPrefsWindow:self];
 }
 
 - (void)closePreferences
 }
 
 - (void)closePreferences
     if ( ( isAppRunning == ITMTRemotePlayerRunning) ) {
         [self setupHotKeys];
     }
     if ( ( isAppRunning == ITMTRemotePlayerRunning) ) {
         [self setupHotKeys];
     }
-    [prefsController release];
-    prefsController = nil;
 }
 
 }
 
+- (ITMTRemote *)currentRemote
+{
+    return currentRemote;
+}
 
 //
 //
 
 //
 //
     [[HotKeyCenter sharedCenter] removeHotKey:@"PlayPause"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"NextTrack"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"PrevTrack"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"PlayPause"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"NextTrack"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"PrevTrack"];
+    [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleVisualizer"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"TrackInfo"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"UpcomingSongs"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"TrackInfo"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"UpcomingSongs"];
+    [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleLoop"];
+    [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleShuffle"];
+    [[HotKeyCenter sharedCenter] removeHotKey:@"IncrementVolume"];
+    [[HotKeyCenter sharedCenter] removeHotKey:@"DecrementVolume"];
+    [[HotKeyCenter sharedCenter] removeHotKey:@"IncrementRating"];
+    [[HotKeyCenter sharedCenter] removeHotKey:@"DecrementRating"];
 }
 
 - (void)setupHotKeys
 }
 
 - (void)setupHotKeys
                 target:self action:@selector(prevSong:)];
     }
     
                 target:self action:@selector(prevSong:)];
     }
     
+    if ([defaults objectForKey:@"ToggleVisualizer"] != nil) {
+        [[HotKeyCenter sharedCenter] addHotKey:@"ToggleVisualizer"
+                combo:[defaults keyComboForKey:@"ToggleVisualizer"]
+                target:self action:@selector(toggleVisualizer)];
+    }
+    
     if ([defaults objectForKey:@"TrackInfo"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"TrackInfo"
                 combo:[defaults keyComboForKey:@"TrackInfo"]
     if ([defaults objectForKey:@"TrackInfo"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"TrackInfo"
                 combo:[defaults keyComboForKey:@"TrackInfo"]
-                target:self action:@selector(showCurrentTrackInfo)];
+                target:self action:@selector(showCurrentTrackInfoStatusWindow)];
     }
     
     if ([defaults objectForKey:@"UpcomingSongs"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs"
                combo:[defaults keyComboForKey:@"UpcomingSongs"]
     }
     
     if ([defaults objectForKey:@"UpcomingSongs"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs"
                combo:[defaults keyComboForKey:@"UpcomingSongs"]
-               target:self action:@selector(showUpcomingSongs)];
+               target:self action:@selector(showUpcomingSongsStatusWindow)];
+    }
+    
+    if ([defaults objectForKey:@"ToggleLoop"] != nil) {
+        [[HotKeyCenter sharedCenter] addHotKey:@"ToggleLoop"
+               combo:[defaults keyComboForKey:@"ToggleLoop"]
+               target:self action:@selector(showToggleLoopStatusWindow)];
+    }
+    
+    if ([defaults objectForKey:@"ToggleShuffle"] != nil) {
+        [[HotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle"
+               combo:[defaults keyComboForKey:@"ToggleShuffle"]
+               target:self action:@selector(showToggleShuffleStatusWindow)];
+    }
+    
+    if ([defaults objectForKey:@"IncrementVolume"] != nil) {
+        [[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume"
+               combo:[defaults keyComboForKey:@"IncrementVolume"]
+               target:self action:@selector(showVolumeIncrementStatusWindow)];
+    }
+    
+    if ([defaults objectForKey:@"DecrementVolume"] != nil) {
+        [[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume"
+               combo:[defaults keyComboForKey:@"DecrementVolume"]
+               target:self action:@selector(showVolumeDecrementStatusWindow)];
+    }
+    
+    if ([defaults objectForKey:@"IncrementRating"] != nil) {
+        [[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating"
+               combo:[defaults keyComboForKey:@"IncrementRating"]
+               target:self action:@selector(showRatingIncrementStatusWindow)];
+    }
+    
+    if ([defaults objectForKey:@"DecrementRating"] != nil) {
+        [[HotKeyCenter sharedCenter] addHotKey:@"DecrementRating"
+               combo:[defaults keyComboForKey:@"DecrementRating"]
+               target:self action:@selector(showRatingDecrementStatusWindow)];
     }
 }
 
 //
 //
     }
 }
 
 //
 //
-// Show Current Track Info And Show Upcoming Songs Floaters
+// Status Window Methods
 //
 //
 
 //
 //
 
-- (void)showCurrentTrackInfo
+- (void)showCurrentTrackInfoStatusWindow
 {
     NSString *trackName = [currentRemote currentSongTitle];
     if (!statusWindow && [trackName length]) {
 {
     NSString *trackName = [currentRemote currentSongTitle];
     if (!statusWindow && [trackName length]) {
             }
         }
         
             }
         }
         
-        [statusWindow setText:stringToShow];
+        //
+        //SHOW THE STATUS WINDOW HERE WITH STRING stringToShow
+        //
+        
+        /*[statusWindow setText:stringToShow];
         [NSTimer scheduledTimerWithTimeInterval:3.0
                     target:self
                     selector:@selector(fadeAndCloseStatusWindow)
                     userInfo:nil
         [NSTimer scheduledTimerWithTimeInterval:3.0
                     target:self
                     selector:@selector(fadeAndCloseStatusWindow)
                     userInfo:nil
-                    repeats:NO];
+                    repeats:NO];*/
     }
 }
 
     }
 }
 
-- (void)showUpcomingSongs
+- (void)showUpcomingSongsStatusWindow
 {
     int curPlaylist = [currentRemote currentPlaylistIndex];
     if (!statusWindow) {
 {
     int curPlaylist = [currentRemote currentPlaylistIndex];
     if (!statusWindow) {
             int i;
             NSString *songs = @"";
             
             int i;
             NSString *songs = @"";
             
-            statusWindow = [ITTransientStatusWindow sharedWindow];
             for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
                 if (i <= numSongs) {
                     NSString *curSong = [currentRemote songTitleAtIndex:i];
             for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
                 if (i <= numSongs) {
                     NSString *curSong = [currentRemote songTitleAtIndex:i];
                     songs = [songs stringByAppendingString:@"\n"];
                 }
             }
                     songs = [songs stringByAppendingString:@"\n"];
                 }
             }
-            [statusWindow setText:songs];
+            
+            //
+            //SHOW STATUS WINDOW HERE WITH STRING songs
+            //
+            
+            /*[statusWindow setText:songs];
             [NSTimer scheduledTimerWithTimeInterval:3.0
                         target:self
                         selector:@selector(fadeAndCloseStatusWindow)
                         userInfo:nil
             [NSTimer scheduledTimerWithTimeInterval:3.0
                         target:self
                         selector:@selector(fadeAndCloseStatusWindow)
                         userInfo:nil
-                        repeats:NO];
+                        repeats:NO];*/
         }
     }
 }
 
         }
     }
 }
 
+- (void)showVolumeIncrementStatusWindow
+{
+}
+
+- (void)showVolumeDecrementStatusWindow
+{
+}
+
+- (void)showRatingIncrementStatusWindow
+{
+}
+
+- (void)showRatingDecrementStatusWindow
+{
+}
+
+- (void)showToggleLoopStatusWindow
+{
+}
+
+- (void)showToggleShuffleStatusWindow
+{
+}
+
+- (void)toggleVisualizer
+{
+    NSLog(@"Visualizer On/Off");
+}
+
 - (void)fadeAndCloseStatusWindow
 {
     [statusWindow orderOut:self];
 - (void)fadeAndCloseStatusWindow
 {
     [statusWindow orderOut:self];
         case 49:
         {
             /*MenuRef menuRef = _NSGetCarbonMenu([item menu]);
         case 49:
         {
             /*MenuRef menuRef = _NSGetCarbonMenu([item menu]);
-            NSLog(@"%@", menuRef);
-            SetMenuItemCommandKey(menuRef, 0, NO, 49);
-            SetMenuItemModifiers(menuRef, 0, kMenuNoCommandModifier);
-            SetMenuItemKeyGlyph(menuRef, 0, kMenuBlankGlyph);
-            charcode = 'b';*/
+            SetMenuItemCommandKey(menuRef, 1, NO, 49);
+            SetMenuItemModifiers(menuRef, 1, kMenuNoCommandModifier);
+            SetMenuItemKeyGlyph(menuRef, 1, kMenuBlankGlyph);*/
+            charcode = 'b';
+            
         }
         break;
         
         }
         break;