Made Quit more efficient.
[MenuTunes.git] / OldMainController.m
index b3419c7..ce163c1 100755 (executable)
@@ -5,18 +5,24 @@
 
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
+- (void)rebuildUpcomingSongsMenu;
+- (void)rebuildPlaylistMenu;
+- (void)rebuildEQPresetsMenu;
+- (void)updateRatingMenu;
 - (void)setupHotKeys;
+- (void)timerUpdate;
 - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
         onItem:(NSMenuItem *)item;
-- (NSMenu *)mainMenu;
-- (NSMenu *)songRatingMenu;
-- (NSMenu *)playlistsMenu;
-- (NSMenu *)upcomingSongsMenu;
-- (NSMenu *)eqPresetsMenu;
+
 @end
 
 @implementation MainController
 
+/*************************************************************************/
+#pragma mark -
+#pragma mark INITIALIZATION/DEALLOCATION METHODS
+/*************************************************************************/
+
 - (id)init
 {
     if ( ( self = [super init] ) ) {
     }
     [currentRemote halt];
     [statusItem release];
+    [menu release];
     [super dealloc];
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     currentRemote = [self loadRemote];
-    [currentRemote begin];
     
     //Setup for notification of the remote player launching or quitting
-    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(applicationTerminated:) name:NSWorkspaceDidTerminateApplicationNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil];
+    [[[NSWorkspace sharedWorkspace] notificationCenter]
+            addObserver:self
+            selector:@selector(applicationTerminated:)
+            name:NSWorkspaceDidTerminateApplicationNotification
+            object:nil];
     
-    [self registerDefaults];
+    [[[NSWorkspace sharedWorkspace] notificationCenter]
+            addObserver:self
+            selector:@selector(applicationLaunched:)
+            name:NSWorkspaceDidLaunchApplicationNotification
+            object:nil];
+
+    if ( ! [defaults objectForKey:@"menu"] ) {  // If this is nil, defaults have never been registered.
+        [[PreferencesController sharedPrefs] registerDefaults];
+    }
     
-    statusItem = [[ITStatusItem alloc] initWithStatusBar:[NSStatusBar systemStatusBar] withLength:NSSquareStatusItemLength];
-    [statusItem setImage:[NSImage imageNamed:@"menu"]];
-    [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]];
-    // Below line of code is for creating builds for Beta Testers
-    // [statusItem setToolTip:@[NSString stringWithFormat:@"This Nontransferable Beta (Built on %s) of iThink Software's MenuTunes is Registered to: Beta Tester (betatester@somedomain.com).",__DATE__]];
+    statusItem = [[ITStatusItem alloc]
+            initWithStatusBar:[NSStatusBar systemStatusBar]
+            withLength:NSSquareStatusItemLength];
     
+    menu = [[NSMenu alloc] initWithTitle:@""];
     if ( ( [currentRemote playerRunningState] == ITMTRemotePlayerRunning ) ) {
         [self applicationLaunched:nil];
     } else {
         [self applicationTerminated:nil];
     }
+    
+    [statusItem setImage:[NSImage imageNamed:@"menu"]];
+    [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]];
+    // Below line of code is for creating builds for Beta Testers
+    // [statusItem setToolTip:@[NSString stringWithFormat:@"This Nontransferable Beta (Built on %s) of iThink Software's MenuTunes is Registered to: Beta Tester (betatester@somedomain.com).",__DATE__]];
 }
 
 - (void)applicationWillTerminate:(NSNotification *)note
 {
     [self clearHotKeys];
     [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
-    [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
 }
 
-//
-//
-
 - (ITMTRemote *)loadRemote
 {
     NSString *folderPath = [[NSBundle mainBundle] builtInPlugInsPath];
     return [remoteArray objectAtIndex:0];
 }
 
-- (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)applicationLaunched:(NSNotification *)note
 {
     if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
+        [currentRemote begin];
+        [self timerUpdate];
         [NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
-        [statusItem setMenu:[self mainMenu]];
         [self setupHotKeys];
         isAppRunning = ITMTRemotePlayerRunning;
-        return;
     }
-    
-    isAppRunning = ITMTRemotePlayerRunning;
 }
 
 - (void)applicationTerminated:(NSNotification *)note
 {
-    if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {        
-        NSMenu *menu = [[NSMenu alloc] initWithTitle:@""];
-        [[menu addItemWithTitle:[NSString stringWithFormat:@"Open %@", [currentRemote playerSimpleName]] action:@selector(showPlayer:) keyEquivalent:@""] setTarget:self];
-        [menu addItem:[NSMenuItem separatorItem]];
-        [[menu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
-        [[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
-        [statusItem setMenu:[menu autorelease]];
+    if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
+        NSMenu *notRunningMenu = [[NSMenu alloc] initWithTitle:@""];
+        [notRunningMenu addItemWithTitle:[NSString stringWithFormat:@"Open %@", [currentRemote playerSimpleName]] action:@selector(showPlayer:) keyEquivalent:@""];
+        [notRunningMenu addItem:[NSMenuItem separatorItem]];
+        [notRunningMenu addItemWithTitle:@"Preferences..." action:@selector(showPreferences:) keyEquivalent:@""];
+        [[notRunningMenu addItemWithTitle:@"Quit" action:@selector(terminate:) keyEquivalent:@""] setTarget:NSApp];
+        [statusItem setMenu:[notRunningMenu autorelease]];
         
+        [currentRemote halt];
         [refreshTimer invalidate];
         [refreshTimer release];
         refreshTimer = nil;
         [self clearHotKeys];
-        isAppRunning = NO;
-        return;
+        isAppRunning = ITMTRemotePlayerNotRunning;
     }
 }
 
+/*************************************************************************/
+#pragma mark -
+#pragma mark INSTANCE METHODS
+/*************************************************************************/
+
 - (void)startTimerInNewThread
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
-    refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES] retain];
+    refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:0.5
+                             target:self
+                             selector:@selector(timerUpdate)
+                             userInfo:nil
+                             repeats:YES] retain];
     [runLoop run];
     [pool release];
 }
 
-- (void)timerUpdate
+//Recreate the status item menu
+- (void)rebuildMenu
 {
-    ITMTRemotePlayerPlayingState playerPlayingState = [currentRemote playerPlayingState];
-    NSMenu *statusMenu = [statusItem menu];
-    int index;
+    NSUserDefaults *defaults;
+    NSArray *myMenu;
+    int playlist;
+    int i;
+    unichar fullstar = 0x2605;
+    unichar emptystar = 0x2606;
+    NSString *fullStarChar;
+    NSString *emptyStarChar;
     
-    //Update play/pause menu item
-    if (playerPlayingState == ITMTRemotePlayerPlaying) {
-        index = [statusMenu indexOfItemWithTitle:@"Play"];
-        if (index > -1) {
-            [[statusMenu itemAtIndex:index] setTitle:@"Pause"];
-        }
-    } else {
-        index = [statusMenu indexOfItemWithTitle:@"Pause"];
-        if (index > -1) {
-            [[statusMenu itemAtIndex:index] setTitle:@"Play"];
-        }
+    if ([currentRemote playerRunningState] == ITMTRemotePlayerNotRunning) {
+        return;
     }
     
-    if (0 == 1/*Maybe set this to something better sometime*/) {
-        [statusItem setMenu:[self mainMenu]];
+    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;
+    
+    [menu release];
+    menu = [[NSMenu alloc] initWithTitle:@""];
+    
+    //Release the old submenus
+    playPauseItem = nil;
+    upcomingSongsItem = nil;
+    [upcomingSongsMenu release];
+    upcomingSongsMenu = nil;
+    playlistItem = nil;
+    [playlistMenu release];
+    playlistMenu = nil;
+    eqItem = nil;
+    [eqMenu release];
+    eqMenu = nil;
+    if (ratingItem) {
+        [ratingItem setSubmenu:nil];
+        [ratingItem release];
+        ratingItem = nil;
     }
-}
-
-//
-//
-
-- (NSMenu *)mainMenu
-{
-    NSMenu *mainMenu = [[NSMenu alloc] initWithTitle:@""];
-    NSArray *myMenu = [[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"];
-    int i;
     
+    //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 *currentItem = [myMenu objectAtIndex:i];
-        
-        if ([currentItem isEqualToString:@"Play/Pause"]) {
+        NSString *item = [myMenu objectAtIndex:i];
+        if ([item isEqualToString:@"Play/Pause"]) {
             KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PlayPause"];
-            NSMenuItem *playPauseMenuItem = [mainMenu addItemWithTitle:@"Play" action:@selector(playPause:) keyEquivalent:@""];
-            [playPauseMenuItem setTarget:self];
+            playPauseItem = [menu addItemWithTitle:@"Play"
+                                    action:@selector(playPause:)
+                                    keyEquivalent:@""];
             
             if (tempCombo) {
                 [self setKeyEquivalentForCode:[tempCombo keyCode]
-                    andModifiers:[tempCombo modifiers] onItem:playPauseMenuItem];
+                    andModifiers:[tempCombo modifiers] onItem:playPauseItem];
                 [tempCombo release];
             }
-        } else if ([currentItem isEqualToString:@"Next Track"]) {
+        } else if ([item isEqualToString:@"Next Track"]) {
             KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"NextTrack"];
-            NSMenuItem *nextTrack = [mainMenu addItemWithTitle:@"Next Track" action:@selector(nextSong:) keyEquivalent:@""];
-            [nextTrack setTarget:self];
+            NSMenuItem *nextTrack = [menu addItemWithTitle:@"Next Track"
+                                        action:@selector(nextSong:)
+                                        keyEquivalent:@""];
+            
             if (tempCombo) {
                 [self setKeyEquivalentForCode:[tempCombo keyCode]
                     andModifiers:[tempCombo modifiers] onItem:nextTrack];
                 [tempCombo release];
             }
-        } else if ([currentItem isEqualToString:@"Previous Track"]) {
+        } else if ([item isEqualToString:@"Previous Track"]) {
             KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PrevTrack"];
-            NSMenuItem *prevTrack = [mainMenu addItemWithTitle:@"Previous Track" action:@selector(prevSong:) keyEquivalent:@""];
-            [prevTrack setTarget:self];
+            NSMenuItem *prevTrack = [menu addItemWithTitle:@"Previous Track"
+                                        action:@selector(prevSong:)
+                                        keyEquivalent:@""];
+            
             if (tempCombo) {
                 [self setKeyEquivalentForCode:[tempCombo keyCode]
                     andModifiers:[tempCombo modifiers] onItem:prevTrack];
                 [tempCombo release];
             }
-        } else if ([currentItem isEqualToString:@"Fast Forward"]) {
-            [[mainMenu addItemWithTitle:@"Fast Forward"action:@selector(fastForward:) keyEquivalent:@""] setTarget:self];
-        } else if ([currentItem isEqualToString:@"Rewind"]) {
-            [[mainMenu addItemWithTitle:@"Rewind" action:@selector(rewind:) keyEquivalent:@""] setTarget:self];
-        } else if ([currentItem isEqualToString:@"EQ Presets"]) {
-            [[mainMenu addItemWithTitle:@"EQ Presets" action:NULL keyEquivalent:@""] setSubmenu:[self eqPresetsMenu]];
-        } else if ([currentItem isEqualToString:@"Playlists"]) {
-            [[mainMenu addItemWithTitle:@"Playlists" action:NULL keyEquivalent:@""] setSubmenu:[self playlistsMenu]];
-        } else if ([currentItem isEqualToString:@"Song Rating"]) {
-            [[mainMenu addItemWithTitle:@"Song Rating"action:NULL keyEquivalent:@""] setSubmenu:[self songRatingMenu]];
-        } else if ([currentItem isEqualToString:@"Upcoming Songs"]) {
-            [[mainMenu addItemWithTitle:@"Upcoming Songs"action:NULL keyEquivalent:@""] setSubmenu:[self upcomingSongsMenu]];
-        } else if ([currentItem isEqualToString:@"PreferencesÉ"]) {
-            [[mainMenu addItemWithTitle:@"Preferences..." action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
-        } else if ([currentItem isEqualToString:@"Quit"]) {
-            [[mainMenu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
-        } else if ([currentItem isEqualToString:@"Current Song Info"]) {
-            //Current Song Info
-            {
-                int currentSongIndex = [currentRemote currentSongIndex];
-                
-                if (currentSongIndex == 0) {
-                    [mainMenu addItemWithTitle:@"No Song" action:NULL keyEquivalent:@""];
-                } else {
-                    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-                    [mainMenu addItemWithTitle:@"Now Playing" action:NULL keyEquivalent:@""];
-                    
-                    if ([defaults objectForKey:@"showName"]) {
-                        [mainMenu addItemWithTitle:[NSString stringWithFormat:@"       %@", [currentRemote currentSongTitle]] action:NULL keyEquivalent:@""];
-                    }
-                    
-                    if ([defaults objectForKey:@"showAlbum"]) {
-                        [mainMenu addItemWithTitle:[NSString stringWithFormat:@"       %@", [currentRemote currentSongAlbum]] action:NULL keyEquivalent:@""];
-                    }
-                    
-                    if ([defaults objectForKey:@"showArtist"]) {
-                        [mainMenu addItemWithTitle:[NSString stringWithFormat:@"       %@", [currentRemote currentSongArtist]] action:NULL keyEquivalent:@""];
-                    }
-                    
-                    if ([defaults objectForKey:@"showTime"]) {
-                        [mainMenu addItemWithTitle:[NSString stringWithFormat:@"       %@", [currentRemote currentSongLength]] action:NULL keyEquivalent:@""];
-                    }
-                }
-            }
-        } else if ([currentItem isEqualToString:@"<separator>"]) {
-            [mainMenu addItem:[NSMenuItem separatorItem]];
+        } else if ([item isEqualToString:@"Fast Forward"]) {
+            [menu addItemWithTitle:@"Fast Forward"
+                    action:@selector(fastForward:)
+                    keyEquivalent:@""];
+        } else if ([item isEqualToString:@"Rewind"]) {
+            [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:@""];
+            upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""];
+            [upcomingSongsItem setSubmenu:upcomingSongsMenu];
+            [upcomingSongsItem setEnabled:NO];
+        } else if ([item isEqualToString:@"Playlists"]) {
+            playlistItem = [menu addItemWithTitle:@"Playlists"
+                    action:nil
+                    keyEquivalent:@""];
+        } else if ([item isEqualToString:@"EQ Presets"]) {
+            eqItem = [menu addItemWithTitle:@"EQ Presets"
+                    action:nil
+                    keyEquivalent:@""];
+        } else if ([item isEqualToString:@"PreferencesÉ"]) {
+            [menu addItemWithTitle:@"PreferencesÉ"
+                    action:@selector(showPreferences:)
+                    keyEquivalent:@""];
+        } else if ([item isEqualToString:@"Quit"]) {
+            [[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"]) {
+            ratingItem = [[menu addItemWithTitle:@"Song Rating"
+                    action:nil
+                    keyEquivalent:@""] retain];
+            [ratingItem setSubmenu:ratingMenu];
+        } else if ([item isEqualToString:@"<separator>"]) {
+            [menu addItem:[NSMenuItem separatorItem]];
         }
     }
     
-    NSLog(@"%@", mainMenu);
-    return [mainMenu autorelease];
-}
-
-- (NSMenu *)songRatingMenu
-{
-    NSMenu *songRatingMenu = [[NSMenu alloc] initWithTitle:@""];
-    unichar fullstar = 0x2605;
-    unichar emptystar = 0x2606;
-    NSString *fullStarChar = [NSString stringWithCharacters:&fullstar length:1];
-    NSString *emptyStarChar = [NSString stringWithCharacters:&emptystar length:1];
-    NSMenuItem *item;
-    int currentSongRating = ([currentRemote currentSongRating] * 5);
+    if (playlistItem) {
+        [self rebuildPlaylistMenu];
+    }
     
-    item = [songRatingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
-    [item setTarget:self];
-    [item setTag:0];
+    if (eqItem) {
+        [self rebuildEQPresetsMenu];
+    }
     
-    item = [songRatingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
-    [item setTarget:self];
-    [item setTag:20];
+    isPlayingRadio = ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist);
     
-    item = [songRatingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
-    [item setTarget:self];
-    [item setTag:40];
+    if (upcomingSongsItem) {
+        [self rebuildUpcomingSongsMenu];
+    }
     
-    item = [songRatingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
-    [item setTarget:self];
-    [item setTag:60];
+    if (ratingItem) {
+        if (isPlayingRadio || !playlist) {
+            [ratingItem setEnabled:NO];
+        } else {
+            int currentSongRating = ([currentRemote currentSongRating] * 5);
+            lastSongRating = currentSongRating;
+            [[ratingMenu itemAtIndex:lastSongRating] setState:NSOnState];
+            [ratingItem setEnabled:YES];
+        }
+    }
     
-    item = [songRatingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
-    [item setTarget:self];
-    [item setTag:80];
+    //Set the new unique song identifier
+    lastSongIdentifier = [[currentRemote currentSongUniqueIdentifier] retain];
     
-    item = [songRatingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, fullStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
-    [item setTarget:self];
-    [item setTag:100];
+    //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];
+                }
+            }
+            
+            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];
+                }
+            }
+            
+            if ([defaults boolForKey:@"showArtist"]) {
+                NSString *artist = [currentRemote currentSongArtist];
+                if ([artist length] > 0) {
+                    [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", artist] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+                }
+            }
+            
+            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];
+                }
+            }
+            
+            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];
+        }
+    }
     
-    [[songRatingMenu itemAtIndex:(currentSongRating / 20)] setState:NSOnState];
+    [statusItem setMenu:menu];
     
-    return [songRatingMenu autorelease];
+    [self clearHotKeys];
+    [self setupHotKeys];
 }
 
-- (void)selectSongRating:(id)sender
+//Rebuild the upcoming songs submenu. Can be improved a lot.
+- (void)rebuildUpcomingSongsMenu
 {
-    [currentRemote setCurrentSongRating:(float)[sender tag] / 100.0];
+    int curIndex = [currentRemote currentPlaylistIndex];
+    int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curIndex];
+    int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];
+    
+    if (!isPlayingRadio) {
+        if (numSongs > 0) {
+            int curTrack = [currentRemote currentSongIndex];
+            int i;
+            
+            [upcomingSongsMenu release];
+            upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""];
+            [upcomingSongsItem setSubmenu:upcomingSongsMenu];
+            [upcomingSongsItem setEnabled:YES];
+            
+            for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
+                if (i <= numSongs) {
+                    NSString *curSong = [currentRemote songTitleAtIndex:i];
+                    NSMenuItem *songItem;
+                    songItem = [[NSMenuItem alloc] initWithTitle:curSong action:@selector(selectSong:) keyEquivalent:@""];
+                    [songItem setRepresentedObject:[NSNumber numberWithInt:i]];
+                    [upcomingSongsMenu addItem:songItem];
+                    [songItem release];
+                } else {
+                    break;
+                }
+            }
+        }
+    } else {
+        [upcomingSongsItem setSubmenu:nil];
+        [upcomingSongsItem setEnabled:NO];
+    }
 }
 
-- (NSMenu *)playlistsMenu
+- (void)rebuildPlaylistMenu
 {
-    NSMenu *playlistsMenu = [[NSMenu alloc] initWithTitle:@""];
     NSArray *playlists = [currentRemote playlists];
-    int i, currentPlaylistIndex = [currentRemote currentPlaylistIndex];
+    int i, currentPlaylist = [currentRemote currentPlaylistIndex];
     
-    if ([currentRemote classOfPlaylistAtIndex:currentPlaylistIndex] == ITMTRemotePlayerRadioPlaylist) {
-        currentPlaylistIndex = 0;
-    }
+    [playlistMenu release];
+    playlistMenu = [[NSMenu alloc] initWithTitle:@""];
     
     for (i = 0; i < [playlists count]; i++) {
-        NSString *name = [playlists objectAtIndex:i];
-        NSMenuItem *item;
-        item = [playlistsMenu addItemWithTitle:name action:@selector(selectPlaylist:) keyEquivalent:@""];
-        [item setTarget:self];
-        [item setTag:i + 1];
-        
-        if (i + 1 == currentPlaylistIndex) {
-            [item setState:NSOnState];
-        }
+        NSString *playlistName = [playlists objectAtIndex:i];
+        NSMenuItem *tempItem;
+        tempItem = [[NSMenuItem alloc] initWithTitle:playlistName action:@selector(selectPlaylist:) keyEquivalent:@""];
+        [tempItem setTag:i + 1];
+        [playlistMenu addItem:tempItem];
+        [tempItem release];
+    }
+    [playlistItem setSubmenu:playlistMenu];
+    [playlistItem setEnabled:YES];
+    
+    if (!isPlayingRadio && currentPlaylist) {
+        [[playlistMenu itemAtIndex:currentPlaylist - 1] setState:NSOnState];
     }
-    return [playlistsMenu autorelease];
 }
 
-- (void)selectPlaylist:(id)sender
+//Build a menu with the list of all available EQ presets
+- (void)rebuildEQPresetsMenu
 {
-    int newPlaylistIndex = [sender tag];
-    if ([currentRemote currentPlaylistIndex] + 1 != newPlaylistIndex) {
-        [currentRemote switchToPlaylistAtIndex:newPlaylistIndex];
+    NSArray *eqPresets = [currentRemote eqPresets];
+    int i;
+    
+    [eqMenu autorelease];
+    eqMenu = [[NSMenu alloc] initWithTitle:@""];
+    
+    for (i = 0; i < [eqPresets count]; i++) {
+        NSString *name;
+        NSMenuItem *tempItem;
+       if ( ( name = [eqPresets objectAtIndex:i] ) ) {
+            tempItem = [[NSMenuItem alloc] initWithTitle:name action:@selector(selectEQPreset:) keyEquivalent:@""];
+            [tempItem setTag:i];
+            [eqMenu addItem:tempItem];
+            [tempItem autorelease];
+       }
     }
+    
+    [eqItem setSubmenu:eqMenu];
+    [eqItem setEnabled:YES];
+    [[eqMenu itemAtIndex:([currentRemote currentEQPresetIndex] - 1)] setState:NSOnState];
 }
 
-- (NSMenu *)upcomingSongsMenu
+- (void)updateRatingMenu
 {
-    NSMenu *upcomingSongsMenu;
-    int i, currentPlaylistIndex, currentPlaylistLength, currentSongIndex, songsInAdvance;
-    
-    if ([currentRemote classOfPlaylistAtIndex:currentPlaylistIndex] == ITMTRemotePlayerRadioPlaylist)
-    {
-        return nil;
+    int currentSongRating = ([currentRemote currentSongRating] * 5);
+    if ([currentRemote currentPlaylistIndex] && (currentSongRating != lastSongRating)) {
+        if ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist) {
+            return;
+        }
+        [[ratingMenu itemAtIndex:lastSongRating] setState:NSOffState];
+        lastSongRating = currentSongRating;
+        [[ratingMenu itemAtIndex:lastSongRating] setState:NSOnState];
+    }
+}
+
+- (void)timerUpdate
+{
+    NSString *currentIdentifier = [currentRemote currentSongUniqueIdentifier];
+    if (![lastSongIdentifier isEqualToString:currentIdentifier] ||
+       (!isPlayingRadio && ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist))) {
+        //
+        //
+        // If we want to show the new track floater, do it here!
+        //[self showCurrentTrackInfo];
+        //
+        //
+        [self rebuildMenu];
     }
     
-    upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""];
-    currentPlaylistIndex = [currentRemote currentPlaylistIndex];
-    currentPlaylistLength = [currentRemote numberOfSongsInPlaylistAtIndex:currentPlaylistIndex];
-    currentSongIndex = [currentRemote currentSongIndex];
-    songsInAdvance = 8; //Change according to the preferences
+    [self updateRatingMenu];
     
-    for (i = currentSongIndex + 1; i <= currentSongIndex + songsInAdvance; i++) {
-        if (i <= currentPlaylistLength) {
-            NSString *name = [currentRemote songTitleAtIndex:i];
-            NSMenuItem *item;
-            
-            item = [upcomingSongsMenu addItemWithTitle:name action:@selector(selectUpcomingSong:) keyEquivalent:@""];
-            [item setTarget:self];
-            [item setTag:i];
+    //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 {
+            [playPauseItem setTitle:@"Play"];
         }
     }
-    return [upcomingSongsMenu autorelease];    
 }
 
-- (void)selectUpcomingSong:(id)sender
+//
+//
+// Menu Selectors
+//
+//
+
+- (void)selectSong:(id)sender
 {
-    [currentRemote switchToSongAtIndex:[sender tag]];
+    [currentRemote switchToSongAtIndex:[[sender representedObject] intValue]];
 }
 
-- (NSMenu *)eqPresetsMenu
+- (void)selectPlaylist:(id)sender
 {
-    NSMenu *eqPresetsMenu = [[NSMenu alloc] initWithTitle:@""];
-    NSArray *eqPresets = [currentRemote eqPresets];
-    int i, currentPresetIndex = [currentRemote currentEQPresetIndex];
+    int playlist = [sender tag];
+    [currentRemote switchToPlaylistAtIndex:playlist];
+}
+
+- (void)selectEQPreset:(id)sender
+{
+    int curSet = [currentRemote currentEQPresetIndex];
+    int item = [sender tag];
     
-    NSMenuItem *eqEnabledMenuItem;
+    [currentRemote switchToEQAtIndex:item];
+    [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState];
+    [[eqMenu itemAtIndex:item] setState:NSOnState];
+}
+
+- (void)selectSongRating:(id)sender
+{
+    int newRating = [sender tag];
+    [[ratingMenu itemAtIndex:lastSongRating] setState:NSOffState];
+    [sender setState:NSOnState];
+    [currentRemote setCurrentSongRating:(float)newRating / 100.0];
+    lastSongRating = newRating / 20;
+}
+
+- (void)playPause:(id)sender
+{
+    ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState];
     
-    eqEnabledMenuItem = [eqPresetsMenu addItemWithTitle:@"Enabled" action:@selector(selectEQPreset:) keyEquivalent:@""];
-    [eqEnabledMenuItem setTarget:self];
-    [eqEnabledMenuItem setTag:-1];
-    if ([currentRemote equalizerEnabled] == YES) {
-        [eqEnabledMenuItem setState:NSOnState];
+    if (state == ITMTRemotePlayerPlaying) {
+        [currentRemote pause];
+        [playPauseItem setTitle:@"Play"];
+    } else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) {
+        [currentRemote pause];
+        [currentRemote play];
+    } else {
+        [currentRemote play];
+        [playPauseItem setTitle:@"Pause"];
     }
-    
-    [eqPresetsMenu addItem:[NSMenuItem separatorItem]];
-    
-    for (i = 0; i < [eqPresets count]; i++) {
-        NSString *name = [eqPresets objectAtIndex:i];
-        NSMenuItem *item;
-        
-        item = [eqPresetsMenu addItemWithTitle:name action:@selector(selectEQPreset:) keyEquivalent:@""];
-        [item setTarget:self];
-        [item setTag:i];
-        
-        if (currentPresetIndex == i) {
-            [item setState:NSOnState];
+}
+
+- (void)nextSong:(id)sender
+{
+    [currentRemote goToNextSong];
+}
+
+- (void)prevSong:(id)sender
+{
+    [currentRemote goToPreviousSong];
+}
+
+- (void)fastForward:(id)sender
+{
+    [currentRemote forward];
+    [playPauseItem setTitle:@"Play"];
+}
+
+- (void)rewind:(id)sender
+{
+    [currentRemote rewind];
+    [playPauseItem setTitle:@"Play"];
+}
+
+//
+//
+
+- (void)showPlayer:(id)sender
+{
+    if ( ( isAppRunning == ITMTRemotePlayerRunning) ) {
+        [currentRemote showPrimaryInterface];
+    } else {
+        if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) {
+            NSLog(@"Error Launching Player");
         }
     }
-    return [eqPresetsMenu autorelease];
 }
 
-- (void)selectEQPreset:(id)sender
+- (void)showPreferences:(id)sender
 {
-    int newEQPresetIndex = [sender tag];
-    
-    if (newEQPresetIndex == -1) {
-        [currentRemote setEqualizerEnabled:![currentRemote equalizerEnabled]];
-    }
-    
-    if ([currentRemote currentEQPresetIndex] + 1 != newEQPresetIndex) {
-        [currentRemote switchToEQAtIndex:newEQPresetIndex];
+    [[PreferencesController sharedPrefs] setController:self];
+    [[PreferencesController sharedPrefs] showPrefsWindow:self];
+}
+
+- (void)closePreferences
+{
+    if ( ( isAppRunning == ITMTRemotePlayerRunning) ) {
+        [self setupHotKeys];
     }
 }
 
+- (ITMTRemote *)currentRemote
+{
+    return currentRemote;
+}
+
+//
+//
+// Hot key setup
 //
 //
 
     [[HotKeyCenter sharedCenter] removeHotKey:@"PrevTrack"];
     [[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
                combo:[defaults keyComboForKey:@"UpcomingSongs"]
                target:self action:@selector(showUpcomingSongs)];
     }
+    
+    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)];
+    }
 }
 
+//
+//
+// Status Window Methods
 //
 //
 
-- (void)playPause:(id)sender
+- (void)showCurrentTrackInfo
 {
-    ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState];
-    NSMenu *statusMenu = [statusItem menu];
-    
-    if (state == ITMTRemotePlayerPlaying) {
-        [currentRemote pause];
-        [[statusMenu itemAtIndex:[statusMenu indexOfItemWithTitle:@"Pause"]] setTitle:@"Play"];
-    } else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) {
-        [currentRemote pause];
-        [currentRemote play];
-    } else {
-        [currentRemote play];
-        [[statusMenu itemAtIndex:[statusMenu indexOfItemWithTitle:@"Play"]] setTitle:@"Pause"];
+    NSString *trackName = [currentRemote currentSongTitle];
+    if (!statusWindow && [trackName length]) {
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        NSString *stringToShow = @"";
+        
+        if ([defaults boolForKey:@"showName"]) {
+            if ([defaults boolForKey:@"showArtist"]) {
+                NSString *trackArtist = [currentRemote currentSongArtist];
+                trackName = [NSString stringWithFormat:@"%@ - %@", trackArtist, trackName];
+            }
+            stringToShow = [stringToShow stringByAppendingString:trackName];
+            stringToShow = [stringToShow stringByAppendingString:@"\n"];
+        }
+        
+        if ([defaults boolForKey:@"showAlbum"]) {
+            NSString *trackAlbum = [currentRemote currentSongAlbum];
+            if ([trackAlbum length]) {
+                stringToShow = [stringToShow stringByAppendingString:trackAlbum];
+                stringToShow = [stringToShow stringByAppendingString:@"\n"];
+            }
+        }
+        
+        if ([defaults boolForKey:@"showTime"]) {
+            NSString *trackTime = [currentRemote currentSongLength];
+            if ([trackTime length]) {
+                stringToShow = [NSString stringWithFormat:@"%@Total Time: %@\n", stringToShow, trackTime];
+            }
+        }
+        
+        {
+            int trackTimeLeft = [[currentRemote currentSongRemaining] intValue];
+            int minutes = trackTimeLeft / 60, seconds = trackTimeLeft % 60;
+            if (seconds < 10) {
+                stringToShow = [stringToShow stringByAppendingString:
+                            [NSString stringWithFormat:@"Time Remaining: %i:0%i", minutes, seconds]];
+            } else {
+                stringToShow = [stringToShow stringByAppendingString:
+                            [NSString stringWithFormat:@"Time Remaining: %i:%i", minutes, seconds]];
+            }
+        }
+        
+        //
+        //SHOW THE STATUS WINDOW HERE WITH STRING stringToShow
+        //
+        
+        /*[statusWindow setText:stringToShow];
+        [NSTimer scheduledTimerWithTimeInterval:3.0
+                    target:self
+                    selector:@selector(fadeAndCloseStatusWindow)
+                    userInfo:nil
+                    repeats:NO];*/
     }
 }
 
-- (void)nextSong:(id)sender
-{
-    [currentRemote goToNextSong];
-}
-
-- (void)prevSong:(id)sender
+- (void)showUpcomingSongs
 {
-    [currentRemote goToPreviousSong];
+    int curPlaylist = [currentRemote currentPlaylistIndex];
+    if (!statusWindow) {
+        int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curPlaylist];
+        
+        if (numSongs > 0) {
+            int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];
+            int curTrack = [currentRemote currentSongIndex];
+            int i;
+            NSString *songs = @"";
+            
+            for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
+                if (i <= numSongs) {
+                    NSString *curSong = [currentRemote songTitleAtIndex:i];
+                    songs = [songs stringByAppendingString:curSong];
+                    songs = [songs stringByAppendingString:@"\n"];
+                }
+            }
+            
+            //
+            //SHOW STATUS WINDOW HERE WITH STRING songs
+            //
+            
+            /*[statusWindow setText:songs];
+            [NSTimer scheduledTimerWithTimeInterval:3.0
+                        target:self
+                        selector:@selector(fadeAndCloseStatusWindow)
+                        userInfo:nil
+                        repeats:NO];*/
+        }
+    }
 }
 
-- (void)fastForward:(id)sender
+- (void)showVolumeIncrementStatusWindow
 {
-    [currentRemote forward];
 }
 
-- (void)rewind:(id)sender
+- (void)showVolumeDecrementStatusWindow
 {
-    [currentRemote rewind];
 }
 
-- (void)toggleEqualizer
+- (void)showRatingIncrementStatusWindow
 {
-    [currentRemote setEqualizerEnabled:![currentRemote equalizerEnabled]];
 }
 
-- (void)quitMenuTunes:(id)sender
+- (void)showRatingDecrementStatusWindow
 {
-    [NSApp terminate:self];
 }
 
-- (void)showPreferences:(id)sender
+- (void)showToggleLoopStatusWindow
 {
-    if (!prefsController) {
-        prefsController = [[PreferencesController alloc] initWithMenuTunes:self];
-        [self clearHotKeys];
-    }
 }
 
-- (void)closePreferences
+- (void)showToggleShuffleStatusWindow
 {
-    if ( ( isAppRunning == ITMTRemotePlayerRunning) ) {
-        [self setupHotKeys];
-    }
-    [prefsController release];
-    prefsController = nil;
 }
 
-- (void)showPlayer:(id)sender
+- (void)fadeAndCloseStatusWindow
 {
-    if ( ( isAppRunning == ITMTRemotePlayerRunning) ) {
-        [currentRemote showPrimaryInterface];
-    } else {
-        if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) {
-            NSLog(@"Error Launching Player");
-        }
-    }
+    [statusWindow orderOut:self];
 }
 
-//
-//
-
-//The status window methods go here!
-
-//
-//
-
 - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
         onItem:(NSMenuItem *)item
 {
         //Space -- ARGH!
         case 49:
         {
-            /*MenuRef menuRef = _NSGetCarbonMenu([item menu]);
-            NSLog(@"%@", menuRef);
-            SetMenuItemCommandKey(menuRef, 0, NO, 49);
-            SetMenuItemModifiers(menuRef, 0, kMenuNoCommandModifier);
-            SetMenuItemKeyGlyph(menuRef, 0, kMenuBlankGlyph);
-            charcode = 'b';*/
+            MenuRef menuRef = _NSGetCarbonMenu([item menu]);
+            SetMenuItemCommandKey(menuRef, 1, NO, 49);
+            SetMenuItemModifiers(menuRef, 1, kMenuNoCommandModifier);
+            SetMenuItemKeyGlyph(menuRef, 1, kMenuBlankGlyph);
+            charcode = 'b';
+            
         }
         break;
         
     }
 }
 
-@end
\ No newline at end of file
+@end