git.ithinksw.org / MenuTunes.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Positioning and hidden ratings for radio
[MenuTunes.git] / MainController.m
diff --git a/MainController.m b/MainController.m
index f6838d9..e6d338b 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -36,15 +36,24 @@ static MainController *sharedController;
         sharedController = self;
         
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
         sharedController = self;
         
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
-        statusWindowController = [[StatusWindowController alloc] init];
+        statusWindowController = [StatusWindowController sharedController];
         menuController = [[MenuController alloc] init];
         df = [[NSUserDefaults standardUserDefaults] retain];
         menuController = [[MenuController alloc] init];
         df = [[NSUserDefaults standardUserDefaults] retain];
+        timerUpdating = NO;
     }
     return self;
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
     }
     return self;
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
+    //Turn on debug mode if needed
+    if ([df boolForKey:@"ITDebugMode"]) {
+        SetITDebugMode(YES);
+    }
+    
+    bling = [[MTBlingController alloc] init];
+    blingDate = nil;
+    
     currentRemote = [self loadRemote];
     [currentRemote begin];
     
     currentRemote = [self loadRemote];
     [currentRemote begin];
     
@@ -74,23 +83,21 @@ static MainController *sharedController;
         [self applicationLaunched:nil];
     } else {
         if ([df boolForKey:@"LaunchPlayerWithMT"])
         [self applicationLaunched:nil];
     } else {
         if ([df boolForKey:@"LaunchPlayerWithMT"])
-        {
             [self showPlayer];
             [self showPlayer];
-        }
         else
         else
-        {
             [self applicationTerminated:nil];
             [self applicationTerminated:nil];
-        }
     }
     
     [statusItem setImage:[NSImage imageNamed:@"MenuNormal"]];
     [statusItem setAlternateImage:[NSImage imageNamed:@"MenuInverted"]];
     }
     
     [statusItem setImage:[NSImage imageNamed:@"MenuNormal"]];
     [statusItem setAlternateImage:[NSImage imageNamed:@"MenuInverted"]];
+
+    [NSApp deactivate];
 }
 
 - (ITMTRemote *)loadRemote
 {
     NSString *folderPath = [[NSBundle mainBundle] builtInPlugInsPath];
 }
 
 - (ITMTRemote *)loadRemote
 {
     NSString *folderPath = [[NSBundle mainBundle] builtInPlugInsPath];
-    
+    ITDebugLog(@"Gathering remotes.");
     if (folderPath) {
         NSArray      *bundlePathList = [NSBundle pathsForResourcesOfType:@"remote" inDirectory:folderPath];
         NSEnumerator *enumerator     = [bundlePathList objectEnumerator];
     if (folderPath) {
         NSArray      *bundlePathList = [NSBundle pathsForResourcesOfType:@"remote" inDirectory:folderPath];
         NSEnumerator *enumerator     = [bundlePathList objectEnumerator];
@@ -104,8 +111,8 @@ static MainController *sharedController;
 
                 if ([remoteClass conformsToProtocol:@protocol(ITMTRemote)] &&
                     [remoteClass isKindOfClass:[NSObject class]]) {
 
                 if ([remoteClass conformsToProtocol:@protocol(ITMTRemote)] &&
                     [remoteClass isKindOfClass:[NSObject class]]) {
-
                     id remote = [remoteClass remote];
                     id remote = [remoteClass remote];
+                    ITDebugLog(@"Adding remote at path %@", bundlePath);
                     [remoteArray addObject:remote];
                 }
             }
                     [remoteArray addObject:remote];
                 }
             }
@@ -127,7 +134,7 @@ static MainController *sharedController;
 #pragma mark INSTANCE METHODS
 /*************************************************************************/
 
 #pragma mark INSTANCE METHODS
 /*************************************************************************/
 
-- (void)startTimerInNewThread
+/*- (void)startTimerInNewThread
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
@@ -137,7 +144,34 @@ static MainController *sharedController;
                              userInfo:nil
                              repeats:YES] retain];
     [runLoop run];
                              userInfo:nil
                              repeats:YES] retain];
     [runLoop run];
+    ITDebugLog(@"Timer started.");
     [pool release];
     [pool release];
+}*/
+
+- (void)blingTime
+{
+    NSDate *now = [NSDate date];
+    if ( (! blingDate) || ([now timeIntervalSinceDate:blingDate] >= 86400) ) {
+        [bling showPanelIfNeeded];
+        [blingDate autorelease];
+        blingDate = [now retain];
+    }
+}
+
+- (void)blingNow
+{
+    [bling showPanel];
+    [blingDate autorelease];
+    blingDate = [[NSDate date] retain];
+}
+
+- (BOOL)blingBling
+{
+    if ( ! ([bling checkDone] == 2475) ) {
+        return NO;
+    } else {
+        return YES;
+    }
 }
 
 - (BOOL)songIsPlaying
 }
 
 - (BOOL)songIsPlaying
@@ -162,30 +196,32 @@ static MainController *sharedController;
 
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier
 {
 
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier
 {
+    ITDebugLog(@"Setting latest song identifier to %@", newIdentifier);
     [_latestSongIdentifier autorelease];
     _latestSongIdentifier = [newIdentifier copy];
 }
 
 - (void)timerUpdate
 {
     [_latestSongIdentifier autorelease];
     _latestSongIdentifier = [newIdentifier copy];
 }
 
 - (void)timerUpdate
 {
-    //This huge if statement is being nasty
-    /*if ( ( [self songChanged] ) ||
-         ( ([self radioIsPlaying]) && (latestPlaylistClass != ITMTRemotePlayerRadioPlaylist) ) ||
-         ( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) )*/
-    
-    if ([self songChanged]) {
-        [self setLatestSongIdentifier:[currentRemote playerStateUniqueIdentifier]];
+    if ( [self songChanged] && (timerUpdating != YES) ) {
+        ITDebugLog(@"The song changed.");
+        timerUpdating = YES;
         latestPlaylistClass = [currentRemote currentPlaylistClass];
         [menuController rebuildSubmenus];
         latestPlaylistClass = [currentRemote currentPlaylistClass];
         [menuController rebuildSubmenus];
-        
+
         if ( [df boolForKey:@"showSongInfoOnChange"] ) {
         if ( [df boolForKey:@"showSongInfoOnChange"] ) {
-            [self showCurrentTrackInfo];
+            [self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];
         }
         }
+        
+        [self setLatestSongIdentifier:[currentRemote playerStateUniqueIdentifier]];
+        
+        timerUpdating = NO;
     }
 }
 
 - (void)menuClicked
 {
     }
 }
 
 - (void)menuClicked
 {
+    ITDebugLog(@"Menu clicked.");
     if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) {
         [statusItem setMenu:[menuController menu]];
     } else {
     if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) {
         [statusItem setMenu:[menuController menu]];
     } else {
@@ -202,7 +238,7 @@ static MainController *sharedController;
 - (void)playPause
 {
     ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState];
 - (void)playPause
 {
     ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState];
-    
+    ITDebugLog(@"Play/Pause toggled");
     if (state == ITMTRemotePlayerPlaying) {
         [currentRemote pause];
     } else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) {
     if (state == ITMTRemotePlayerPlaying) {
         [currentRemote pause];
     } else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) {
@@ -211,67 +247,90 @@ static MainController *sharedController;
     } else {
         [currentRemote play];
     }
     } else {
         [currentRemote play];
     }
+    [self timerUpdate];
 }
 
 - (void)nextSong
 {
 }
 
 - (void)nextSong
 {
+    ITDebugLog(@"Going to next song.");
     [currentRemote goToNextSong];
     [currentRemote goToNextSong];
+    [self timerUpdate];
 }
 
 - (void)prevSong
 {
 }
 
 - (void)prevSong
 {
+    ITDebugLog(@"Going to previous song.");
     [currentRemote goToPreviousSong];
     [currentRemote goToPreviousSong];
+    [self timerUpdate];
 }
 
 - (void)fastForward
 {
 }
 
 - (void)fastForward
 {
+    ITDebugLog(@"Fast forwarding.");
     [currentRemote forward];
     [currentRemote forward];
+    [self timerUpdate];
 }
 
 - (void)rewind
 {
 }
 
 - (void)rewind
 {
+    ITDebugLog(@"Rewinding.");
     [currentRemote rewind];
     [currentRemote rewind];
+    [self timerUpdate];
 }
 
 - (void)selectPlaylistAtIndex:(int)index
 {
 }
 
 - (void)selectPlaylistAtIndex:(int)index
 {
+    ITDebugLog(@"Selecting playlist %i", index);
     [currentRemote switchToPlaylistAtIndex:index];
     [currentRemote switchToPlaylistAtIndex:index];
+    [self timerUpdate];
 }
 
 - (void)selectSongAtIndex:(int)index
 {
 }
 
 - (void)selectSongAtIndex:(int)index
 {
+    ITDebugLog(@"Selecting song %i", index);
     [currentRemote switchToSongAtIndex:index];
     [currentRemote switchToSongAtIndex:index];
+    [self timerUpdate];
 }
 
 - (void)selectSongRating:(int)rating
 {
 }
 
 - (void)selectSongRating:(int)rating
 {
+    ITDebugLog(@"Selecting song rating %i", rating);
     [currentRemote setCurrentSongRating:(float)rating / 100.0];
     [currentRemote setCurrentSongRating:(float)rating / 100.0];
+    [self timerUpdate];
 }
 
 - (void)selectEQPresetAtIndex:(int)index
 {
 }
 
 - (void)selectEQPresetAtIndex:(int)index
 {
+    ITDebugLog(@"Selecting EQ preset %i", index);
     [currentRemote switchToEQAtIndex:index];
     [currentRemote switchToEQAtIndex:index];
+    [self timerUpdate];
 }
 
 - (void)showPlayer
 {
 }
 
 - (void)showPlayer
 {
+    ITDebugLog(@"Beginning show player.");
     if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
     if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
+        ITDebugLog(@"Showing player interface.");
         [currentRemote showPrimaryInterface];
     } else {
         [currentRemote showPrimaryInterface];
     } else {
+        ITDebugLog(@"Launching player.");
         if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) {
         if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) {
-            NSLog(@"MenuTunes: Error Launching Player");
+            ITDebugLog(@"Error Launching Player");
         }
     }
         }
     }
+    ITDebugLog(@"Finished show player.");
 }
 
 - (void)showPreferences
 {
 }
 
 - (void)showPreferences
 {
+    ITDebugLog(@"Show preferences.");
     [[PreferencesController sharedPrefs] setController:self];
     [[PreferencesController sharedPrefs] showPrefsWindow:self];
 }
 
 - (void)quitMenuTunes
 {
     [[PreferencesController sharedPrefs] setController:self];
     [[PreferencesController sharedPrefs] showPrefsWindow:self];
 }
 
 - (void)quitMenuTunes
 {
+    ITDebugLog(@"Quitting MenuTunes.");
     [NSApp terminate:self];
 }
 
     [NSApp terminate:self];
 }
 
@@ -280,6 +339,7 @@ static MainController *sharedController;
 
 - (void)closePreferences
 {
 
 - (void)closePreferences
 {
+    ITDebugLog(@"Preferences closed.");
     if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
         [self setupHotKeys];
     }
     if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
         [self setupHotKeys];
     }
@@ -300,17 +360,19 @@ static MainController *sharedController;
 {
     NSEnumerator *hotKeyEnumerator = [[[ITHotKeyCenter sharedCenter] allHotKeys] objectEnumerator];
     ITHotKey *nextHotKey;
 {
     NSEnumerator *hotKeyEnumerator = [[[ITHotKeyCenter sharedCenter] allHotKeys] objectEnumerator];
     ITHotKey *nextHotKey;
-    
+    ITDebugLog(@"Clearing hot keys.");
     while ( (nextHotKey = [hotKeyEnumerator nextObject]) ) {
         [[ITHotKeyCenter sharedCenter] unregisterHotKey:nextHotKey];
     }
     while ( (nextHotKey = [hotKeyEnumerator nextObject]) ) {
         [[ITHotKeyCenter sharedCenter] unregisterHotKey:nextHotKey];
     }
+    ITDebugLog(@"Done clearing hot keys.");
 }
 
 - (void)setupHotKeys
 {
     ITHotKey *hotKey;
 }
 
 - (void)setupHotKeys
 {
     ITHotKey *hotKey;
-    
+    ITDebugLog(@"Setting up hot keys.");
     if ([df objectForKey:@"PlayPause"] != nil) {
     if ([df objectForKey:@"PlayPause"] != nil) {
+        ITDebugLog(@"Setting up play pause hot key.");
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"PlayPause"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PlayPause"]]];
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"PlayPause"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PlayPause"]]];
@@ -320,6 +382,7 @@ static MainController *sharedController;
     }
     
     if ([df objectForKey:@"NextTrack"] != nil) {
     }
     
     if ([df objectForKey:@"NextTrack"] != nil) {
+        ITDebugLog(@"Setting up next track hot key.");
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"NextTrack"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"NextTrack"]]];
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"NextTrack"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"NextTrack"]]];
@@ -329,6 +392,7 @@ static MainController *sharedController;
     }
     
     if ([df objectForKey:@"PrevTrack"] != nil) {
     }
     
     if ([df objectForKey:@"PrevTrack"] != nil) {
+        ITDebugLog(@"Setting up previous track hot key.");
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"PrevTrack"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PrevTrack"]]];
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"PrevTrack"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PrevTrack"]]];
@@ -338,6 +402,7 @@ static MainController *sharedController;
     }
     
     if ([df objectForKey:@"ShowPlayer"] != nil) {
     }
     
     if ([df objectForKey:@"ShowPlayer"] != nil) {
+        ITDebugLog(@"Setting up show player hot key.");
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"ShowPlayer"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]]];
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"ShowPlayer"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]]];
@@ -347,6 +412,7 @@ static MainController *sharedController;
     }
     
     if ([df objectForKey:@"TrackInfo"] != nil) {
     }
     
     if ([df objectForKey:@"TrackInfo"] != nil) {
+        ITDebugLog(@"Setting up track info hot key.");
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"TrackInfo"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]]];
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"TrackInfo"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]]];
@@ -356,6 +422,7 @@ static MainController *sharedController;
     }
     
     if ([df objectForKey:@"UpcomingSongs"] != nil) {
     }
     
     if ([df objectForKey:@"UpcomingSongs"] != nil) {
+        ITDebugLog(@"Setting up upcoming songs hot key.");
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"UpcomingSongs"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"UpcomingSongs"]]];
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"UpcomingSongs"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"UpcomingSongs"]]];
@@ -365,6 +432,7 @@ static MainController *sharedController;
     }
     
     if ([df objectForKey:@"ToggleLoop"] != nil) {
     }
     
     if ([df objectForKey:@"ToggleLoop"] != nil) {
+        ITDebugLog(@"Setting up toggle loop hot key.");
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"ToggleLoop"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleLoop"]]];
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"ToggleLoop"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleLoop"]]];
@@ -374,6 +442,7 @@ static MainController *sharedController;
     }
     
     if ([df objectForKey:@"ToggleShuffle"] != nil) {
     }
     
     if ([df objectForKey:@"ToggleShuffle"] != nil) {
+        ITDebugLog(@"Setting up toggle shuffle hot key.");
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"ToggleShuffle"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShuffle"]]];
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"ToggleShuffle"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShuffle"]]];
@@ -383,6 +452,7 @@ static MainController *sharedController;
     }
     
     if ([df objectForKey:@"IncrementVolume"] != nil) {
     }
     
     if ([df objectForKey:@"IncrementVolume"] != nil) {
+        ITDebugLog(@"Setting up increment volume hot key.");
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"IncrementVolume"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementVolume"]]];
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"IncrementVolume"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementVolume"]]];
@@ -392,6 +462,7 @@ static MainController *sharedController;
     }
     
     if ([df objectForKey:@"DecrementVolume"] != nil) {
     }
     
     if ([df objectForKey:@"DecrementVolume"] != nil) {
+        ITDebugLog(@"Setting up decrement volume hot key.");
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"DecrementVolume"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementVolume"]]];
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"DecrementVolume"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementVolume"]]];
@@ -401,6 +472,7 @@ static MainController *sharedController;
     }
     
     if ([df objectForKey:@"IncrementRating"] != nil) {
     }
     
     if ([df objectForKey:@"IncrementRating"] != nil) {
+        ITDebugLog(@"Setting up increment rating hot key.");
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"IncrementRating"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementRating"]]];
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"IncrementRating"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementRating"]]];
@@ -410,6 +482,7 @@ static MainController *sharedController;
     }
     
     if ([df objectForKey:@"DecrementRating"] != nil) {
     }
     
     if ([df objectForKey:@"DecrementRating"] != nil) {
+        ITDebugLog(@"Setting up decrement rating hot key.");
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"DecrementRating"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementRating"]]];
         hotKey = [[ITHotKey alloc] init];
         [hotKey setName:@"DecrementRating"];
         [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementRating"]]];
@@ -417,19 +490,22 @@ static MainController *sharedController;
         [hotKey setAction:@selector(decrementRating)];
         [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
         [hotKey setAction:@selector(decrementRating)];
         [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
+    ITDebugLog(@"Finished setting up hot keys.");
 }
 
 - (void)showCurrentTrackInfo
 {
 }
 
 - (void)showCurrentTrackInfo
 {
-    NSString *title = [currentRemote currentSongTitle];
-
+    ITMTRemotePlayerSource  source      = [currentRemote currentSource];
+    NSString               *title       = [currentRemote currentSongTitle];
+    NSString               *album       = nil;
+    NSString               *artist      = nil;
+    NSString               *time        = nil;
+    NSString               *track       = nil;
+    int                     rating      = -1;
+    
+    ITDebugLog(@"Showing track info status window.");
+    
     if ( title ) {
     if ( title ) {
-        NSString *album       = nil;
-        NSString *artist      = nil;
-        NSString *time        = nil;
-        int       trackNumber = 0;
-        int       trackTotal  = 0;
-        int       rating      = 0;
 
         if ( [df boolForKey:@"showAlbum"] ) {
             album = [currentRemote currentSongAlbum];
 
         if ( [df boolForKey:@"showAlbum"] ) {
             album = [currentRemote currentSongAlbum];
@@ -440,42 +516,47 @@ static MainController *sharedController;
         }
 
         if ( [df boolForKey:@"showTime"] ) {
         }
 
         if ( [df boolForKey:@"showTime"] ) {
-            time = [currentRemote currentSongLength];
+            time = [NSString stringWithFormat:@"%@: %@ / %@",
+                @"Time",
+                [currentRemote currentSongElapsed],
+                [currentRemote currentSongLength]];
         }
 
         }
 
-        if ( [df boolForKey:@"showNumber"] ) {
-            trackNumber = [currentRemote currentSongTrack];
-            trackTotal  = [currentRemote currentAlbumTrackCount];
+        if ( [df boolForKey:@"showTrackNumber"] ) {
+            int trackNo    = [currentRemote currentSongTrack];
+            int trackCount = [currentRemote currentAlbumTrackCount];
+            
+            if ( (trackNo > 0) || (trackCount > 0) ) {
+                track = [NSString stringWithFormat:@"%@: %i %@ %i",
+                    @"Track", trackNo, @"of", trackCount];
+            }
         }
 
         }
 
-        if ( [df boolForKey:@"showRating"] ) {
-            rating = ( [currentRemote currentSongRating] * 5 );
+        if ( [df boolForKey:@"showTrackRating"] ) {
+            float currentRating = [currentRemote currentSongRating];
+            if (currentRating >= 0.0) {
+                rating = ( currentRating * 5 );
+            }
         }
         }
-
-        [statusWindowController showSongWindowWithTitle:title
-                                                  album:album
-                                                 artist:artist
-                                                   time:time
-                                            trackNumber:trackNumber
-                                             trackTotal:trackTotal
-                                                 rating:rating];
+        
     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
-        [statusWindowController showSongWindowWithTitle:title
-                                                  album:nil
-                                                 artist:nil
-                                                   time:nil
-                                            trackNumber:0
-                                             trackTotal:0
-                                                 rating:0];
     }
     }
+
+    [statusWindowController showSongInfoWindowWithSource:source
+                                                   title:title
+                                                   album:album
+                                                  artist:artist
+                                                    time:time
+                                                   track:track
+                                                  rating:rating];
 }
 
 - (void)showUpcomingSongs
 {
     int curPlaylist = [currentRemote currentPlaylistIndex];
     int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curPlaylist];
 }
 
 - (void)showUpcomingSongs
 {
     int curPlaylist = [currentRemote currentPlaylistIndex];
     int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curPlaylist];
-
+    ITDebugLog(@"Showing upcoming songs status window.");
     if (numSongs > 0) {
         NSMutableArray *songList = [NSMutableArray arrayWithCapacity:5];
         int numSongsInAdvance = [df integerForKey:@"SongsInAdvance"];
     if (numSongs > 0) {
         NSMutableArray *songList = [NSMutableArray arrayWithCapacity:5];
         int numSongsInAdvance = [df integerForKey:@"SongsInAdvance"];
@@ -488,69 +569,87 @@ static MainController *sharedController;
             }
         }
         
             }
         }
         
-        [statusWindowController showUpcomingSongsWithTitles:songList];
+        [statusWindowController showUpcomingSongsWindowWithTitles:songList];
         
     } else {
         
     } else {
-        [statusWindowController showUpcomingSongsWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];
+        [statusWindowController showUpcomingSongsWindowWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];
     }
 }
 
 - (void)incrementVolume
 {
     }
 }
 
 - (void)incrementVolume
 {
-    float volume = [currentRemote volume];
-    volume += 0.2;
+    float volume  = [currentRemote volume];
+    float dispVol = volume;
+    ITDebugLog(@"Incrementing volume.");
+    volume  += 0.110;
+    dispVol += 0.100;
+    
     if (volume > 1.0) {
     if (volume > 1.0) {
-        volume = 1.0;
+        volume  = 1.0;
+        dispVol = 1.0;
     }
     }
+
+    ITDebugLog(@"Setting volume to %f", volume);
     [currentRemote setVolume:volume];
     [currentRemote setVolume:volume];
-    
-    //Show volume status window
-    [statusWindowController showVolumeWindowWithLevel:volume];
+
+    // Show volume status window
+    [statusWindowController showVolumeWindowWithLevel:dispVol];
 }
 
 - (void)decrementVolume
 {
 }
 
 - (void)decrementVolume
 {
-    float volume = [currentRemote volume];
-    volume -= 0.2;
+    float volume  = [currentRemote volume];
+    float dispVol = volume;
+    ITDebugLog(@"Decrementing volume.");
+    volume  -= 0.090;
+    dispVol -= 0.100;
+
     if (volume < 0.0) {
     if (volume < 0.0) {
-        volume = 0.0;
+        volume  = 0.0;
+        dispVol = 0.0;
     }
     }
+    
+    ITDebugLog(@"Setting volume to %f", volume);
     [currentRemote setVolume:volume];
     
     //Show volume status window
     [currentRemote setVolume:volume];
     
     //Show volume status window
-    [statusWindowController showVolumeWindowWithLevel:volume];
+    [statusWindowController showVolumeWindowWithLevel:dispVol];
 }
 
 - (void)incrementRating
 {
     float rating = [currentRemote currentSongRating];
 }
 
 - (void)incrementRating
 {
     float rating = [currentRemote currentSongRating];
+    ITDebugLog(@"Incrementing rating.");
     rating += 0.2;
     if (rating > 1.0) {
         rating = 1.0;
     }
     rating += 0.2;
     if (rating > 1.0) {
         rating = 1.0;
     }
+    ITDebugLog(@"Setting rating to %f", rating);
     [currentRemote setCurrentSongRating:rating];
     
     //Show rating status window
     [currentRemote setCurrentSongRating:rating];
     
     //Show rating status window
-    [statusWindowController showRatingWindowWithLevel:rating];
+    [statusWindowController showRatingWindowWithRating:rating];
 }
 
 - (void)decrementRating
 {
     float rating = [currentRemote currentSongRating];
 }
 
 - (void)decrementRating
 {
     float rating = [currentRemote currentSongRating];
+    ITDebugLog(@"Decrementing rating.");
     rating -= 0.2;
     if (rating < 0.0) {
         rating = 0.0;
     }
     rating -= 0.2;
     if (rating < 0.0) {
         rating = 0.0;
     }
+    ITDebugLog(@"Setting rating to %f", rating);
     [currentRemote setCurrentSongRating:rating];
     
     //Show rating status window
     [currentRemote setCurrentSongRating:rating];
     
     //Show rating status window
-    [statusWindowController showRatingWindowWithLevel:rating];
+    [statusWindowController showRatingWindowWithRating:rating];
 }
 
 - (void)toggleLoop
 {
     ITMTRemotePlayerRepeatMode repeatMode = [currentRemote repeatMode];
 }
 
 - (void)toggleLoop
 {
     ITMTRemotePlayerRepeatMode repeatMode = [currentRemote repeatMode];
-    
+    ITDebugLog(@"Toggling repeat mode.");
     switch (repeatMode) {
         case ITMTRemotePlayerRepeatOff:
             repeatMode = ITMTRemotePlayerRepeatAll;
     switch (repeatMode) {
         case ITMTRemotePlayerRepeatOff:
             repeatMode = ITMTRemotePlayerRepeatAll;
@@ -562,18 +661,21 @@ static MainController *sharedController;
             repeatMode = ITMTRemotePlayerRepeatOff;
         break;
     }
             repeatMode = ITMTRemotePlayerRepeatOff;
         break;
     }
+    ITDebugLog(@"Setting repeat mode to %i", repeatMode);
     [currentRemote setRepeatMode:repeatMode];
     
     //Show loop status window
     [currentRemote setRepeatMode:repeatMode];
     
     //Show loop status window
-    [statusWindowController showLoopWindowWithMode:repeatMode];
+    [statusWindowController showRepeatWindowWithMode:repeatMode];
 }
 
 - (void)toggleShuffle
 {
 }
 
 - (void)toggleShuffle
 {
-    bool newShuffleEnabled = ![currentRemote shuffleEnabled];
+    BOOL newShuffleEnabled = ( ! [currentRemote shuffleEnabled] );
+    ITDebugLog(@"Toggling shuffle mode.");
     [currentRemote setShuffleEnabled:newShuffleEnabled];
     //Show shuffle status window
     [currentRemote setShuffleEnabled:newShuffleEnabled];
     //Show shuffle status window
-    [statusWindowController showLoopWindowWithMode:newShuffleEnabled];
+    ITDebugLog(@"Setting shuffle mode to %i", newShuffleEnabled);
+    [statusWindowController showShuffleWindow:newShuffleEnabled];
 }
 
 /*************************************************************************/
 }
 
 /*************************************************************************/
@@ -584,6 +686,7 @@ static MainController *sharedController;
 - (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]]) {
+        ITDebugLog(@"Remote application launched.");
         [currentRemote begin];
         [self setLatestSongIdentifier:@""];
         [self timerUpdate];
         [currentRemote begin];
         [self setLatestSongIdentifier:@""];
         [self timerUpdate];
@@ -601,6 +704,7 @@ static MainController *sharedController;
  - (void)applicationTerminated:(NSNotification *)note
  {
      if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
  - (void)applicationTerminated:(NSNotification *)note
  {
      if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
+        ITDebugLog(@"Remote application terminated.");
         [currentRemote halt];
         [refreshTimer invalidate];
         [refreshTimer release];
         [currentRemote halt];
         [refreshTimer invalidate];
         [refreshTimer release];
@@ -631,6 +735,7 @@ static MainController *sharedController;
 - (void)dealloc
 {
     [self applicationTerminated:nil];
 - (void)dealloc
 {
     [self applicationTerminated:nil];
+    [bling release];
     [statusItem release];
     [statusWindowController release];
     [menuController release];
     [statusItem release];
     [statusWindowController release];
     [menuController release];
Menu-based iTunes controller.