git.ithinksw.org / MenuTunes.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added ITDebugLogs to MainController and PreferencesController.
[MenuTunes.git] / MainController.m
diff --git a/MainController.m b/MainController.m
index f501b69..a480e3b 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -1,17 +1,17 @@
-#import "NewMainController.h"
+#import "MainController.h"
 #import "MenuController.h"
 #import "PreferencesController.h"
 #import "MenuController.h"
 #import "PreferencesController.h"
-#import "HotKeyCenter.h"
+#import <ITKit/ITHotKeyCenter.h>
+#import <ITKit/ITHotKey.h>
+#import <ITKit/ITKeyCombo.h>
 #import "StatusWindowController.h"
 #import "StatusItemHack.h"
 
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
 #import "StatusWindowController.h"
 #import "StatusItemHack.h"
 
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
-- (void)setupHotKeys;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (void)showCurrentTrackInfo;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (void)showCurrentTrackInfo;
-
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end
@@ -39,13 +39,17 @@ static MainController *sharedController;
         statusWindowController = [[StatusWindowController alloc] init];
         menuController = [[MenuController alloc] init];
         df = [[NSUserDefaults standardUserDefaults] retain];
         statusWindowController = [[StatusWindowController alloc] init];
         menuController = [[MenuController alloc] init];
         df = [[NSUserDefaults standardUserDefaults] retain];
-        [self setLatestSongIdentifier:@"0-0"];
     }
     return self;
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
     }
     return self;
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
+    //Turn on debug mode if needed
+    if ([df boolForKey:@"ITDebugMode"]) {
+        SetITDebugMode(YES);
+    }
+    
     currentRemote = [self loadRemote];
     [currentRemote begin];
     
     currentRemote = [self loadRemote];
     [currentRemote begin];
     
@@ -74,17 +78,20 @@ static MainController *sharedController;
     if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) {
         [self applicationLaunched:nil];
     } else {
     if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) {
         [self applicationLaunched:nil];
     } else {
-        [self applicationTerminated:nil];
+        if ([df boolForKey:@"LaunchPlayerWithMT"])
+            [self showPlayer];
+        else
+            [self applicationTerminated:nil];
     }
     
     }
     
-    [statusItem setImage:[NSImage imageNamed:@"menu"]];
-    [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]];
+    [statusItem setImage:[NSImage imageNamed:@"MenuNormal"]];
+    [statusItem setAlternateImage:[NSImage imageNamed:@"MenuInverted"]];
 }
 
 - (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];
@@ -98,8 +105,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];
                 }
             }
@@ -121,7 +128,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];
@@ -131,12 +138,13 @@ static MainController *sharedController;
                              userInfo:nil
                              repeats:YES] retain];
     [runLoop run];
                              userInfo:nil
                              repeats:YES] retain];
     [runLoop run];
+    ITDebugLog(@"Timer started.");
     [pool release];
     [pool release];
-}
+}*/
 
 - (BOOL)songIsPlaying
 {
 
 - (BOOL)songIsPlaying
 {
-    return ( ! ([[currentRemote currentSongUniqueIdentifier] isEqualToString:@"0-0"]) );
+    return ( ! ([[currentRemote playerStateUniqueIdentifier] isEqualToString:@"0-0"]) );
 }
 
 - (BOOL)radioIsPlaying
 }
 
 - (BOOL)radioIsPlaying
@@ -146,7 +154,7 @@ static MainController *sharedController;
 
 - (BOOL)songChanged
 {
 
 - (BOOL)songChanged
 {
-    return ( ! [[currentRemote currentSongUniqueIdentifier] isEqualToString:_latestSongIdentifier] );
+    return ( ! [[currentRemote playerStateUniqueIdentifier] isEqualToString:_latestSongIdentifier] );
 }
 
 - (NSString *)latestSongIdentifier
 }
 
 - (NSString *)latestSongIdentifier
@@ -156,27 +164,28 @@ 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
 {
-    if ( ( [self songChanged] ) ||
-         ( ([self radioIsPlaying]) && (latestPlaylistClass != ITMTRemotePlayerRadioPlaylist) ) ||
-         ( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) ) {
-        [self setLatestSongIdentifier:[currentRemote currentSongUniqueIdentifier]];
+    if ( [self songChanged] ) {
+        ITDebugLog(@"The song changed.");
+        [self setLatestSongIdentifier:[currentRemote playerStateUniqueIdentifier]];
         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];
         }
     }
 }
 
 - (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 {
@@ -193,7 +202,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)) {
@@ -202,67 +211,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(@"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];
 }
 
@@ -271,6 +303,7 @@ static MainController *sharedController;
 
 - (void)closePreferences
 {
 
 - (void)closePreferences
 {
+    ITDebugLog(@"Preferences closed.");
     if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
         [self setupHotKeys];
     }
     if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
         [self setupHotKeys];
     }
@@ -289,99 +322,153 @@ static MainController *sharedController;
 
 - (void)clearHotKeys
 {
 
 - (void)clearHotKeys
 {
-    [[HotKeyCenter sharedCenter] removeHotKey:@"PlayPause"];
-    [[HotKeyCenter sharedCenter] removeHotKey:@"NextTrack"];
-    [[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"];
+    NSEnumerator *hotKeyEnumerator = [[[ITHotKeyCenter sharedCenter] allHotKeys] objectEnumerator];
+    ITHotKey *nextHotKey;
+    ITDebugLog(@"Clearing hot keys.");
+    while ( (nextHotKey = [hotKeyEnumerator nextObject]) ) {
+        [[ITHotKeyCenter sharedCenter] unregisterHotKey:nextHotKey];
+    }
+    ITDebugLog(@"Done clearing hot keys.");
 }
 
 - (void)setupHotKeys
 {
 }
 
 - (void)setupHotKeys
 {
+    ITHotKey *hotKey;
+    ITDebugLog(@"Setting up hot keys.");
     if ([df objectForKey:@"PlayPause"] != nil) {
     if ([df objectForKey:@"PlayPause"] != nil) {
-        [[HotKeyCenter sharedCenter] addHotKey:@"PlayPause"
-                combo:[df keyComboForKey:@"PlayPause"]
-                target:self action:@selector(playPause)];
+        ITDebugLog(@"Setting up play pause hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"PlayPause"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PlayPause"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(playPause)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
     if ([df objectForKey:@"NextTrack"] != nil) {
     }
     
     if ([df objectForKey:@"NextTrack"] != nil) {
-        [[HotKeyCenter sharedCenter] addHotKey:@"NextTrack"
-                combo:[df keyComboForKey:@"NextTrack"]
-                target:self action:@selector(nextSong)];
+        ITDebugLog(@"Setting up next track hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"NextTrack"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"NextTrack"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(nextSong)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
     if ([df objectForKey:@"PrevTrack"] != nil) {
     }
     
     if ([df objectForKey:@"PrevTrack"] != nil) {
-        [[HotKeyCenter sharedCenter] addHotKey:@"PrevTrack"
-                combo:[df keyComboForKey:@"PrevTrack"]
-                target:self action:@selector(prevSong)];
+        ITDebugLog(@"Setting up previous track hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"PrevTrack"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PrevTrack"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(prevSong)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+    }
+    
+    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 setTarget:self];
+        [hotKey setAction:@selector(showPlayer)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
     if ([df objectForKey:@"TrackInfo"] != nil) {
     }
     
     if ([df objectForKey:@"TrackInfo"] != nil) {
-        [[HotKeyCenter sharedCenter] addHotKey:@"TrackInfo"
-                combo:[df keyComboForKey:@"TrackInfo"]
-                target:self action:@selector(showCurrentTrackInfo)];
+        ITDebugLog(@"Setting up track info hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"TrackInfo"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(showCurrentTrackInfo)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
     if ([df objectForKey:@"UpcomingSongs"] != nil) {
     }
     
     if ([df objectForKey:@"UpcomingSongs"] != nil) {
-        [[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs"
-               combo:[df keyComboForKey:@"UpcomingSongs"]
-               target:self action:@selector(showUpcomingSongs)];
+        ITDebugLog(@"Setting up upcoming songs hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"UpcomingSongs"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"UpcomingSongs"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(showUpcomingSongs)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
     }
     
-/*    if ([df objectForKey:@"ToggleLoop"] != nil) {
-        [[HotKeyCenter sharedCenter] addHotKey:@"ToggleLoop"
-               combo:[df keyComboForKey:@"ToggleLoop"]
-               target:self action:NULL];
+    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 setTarget:self];
+        [hotKey setAction:@selector(toggleLoop)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
     if ([df objectForKey:@"ToggleShuffle"] != nil) {
     }
     
     if ([df objectForKey:@"ToggleShuffle"] != nil) {
-        [[HotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle"
-               combo:[df keyComboForKey:@"ToggleShuffle"]
-               target:self action:NULL];
+        ITDebugLog(@"Setting up toggle shuffle hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"ToggleShuffle"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShuffle"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(toggleShuffle)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
     if ([df objectForKey:@"IncrementVolume"] != nil) {
     }
     
     if ([df objectForKey:@"IncrementVolume"] != nil) {
-        [[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume"
-               combo:[df keyComboForKey:@"IncrementVolume"]
-               target:self action:NULL];
+        ITDebugLog(@"Setting up increment volume hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"IncrementVolume"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementVolume"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(incrementVolume)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
     if ([df objectForKey:@"DecrementVolume"] != nil) {
     }
     
     if ([df objectForKey:@"DecrementVolume"] != nil) {
-        [[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume"
-               combo:[df keyComboForKey:@"DecrementVolume"]
-               target:self action:NULL];
+        ITDebugLog(@"Setting up decrement volume hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"DecrementVolume"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementVolume"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(decrementVolume)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
     if ([df objectForKey:@"IncrementRating"] != nil) {
     }
     
     if ([df objectForKey:@"IncrementRating"] != nil) {
-        [[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating"
-               combo:[df keyComboForKey:@"IncrementRating"]
-               target:self action:NULL];
+        ITDebugLog(@"Setting up increment rating hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"IncrementRating"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementRating"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(incrementRating)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
     if ([df objectForKey:@"DecrementRating"] != nil) {
     }
     
     if ([df objectForKey:@"DecrementRating"] != nil) {
-        [[HotKeyCenter sharedCenter] addHotKey:@"DecrementRating"
-               combo:[df keyComboForKey:@"DecrementRating"]
-               target:self action:NULL];
-    }*/
+        ITDebugLog(@"Setting up decrement rating hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"DecrementRating"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementRating"]]];
+        [hotKey setTarget:self];
+        [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;
+    int                     trackNumber = 0;
+    int                     trackTotal  = 0;
+    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];
@@ -403,31 +490,26 @@ static MainController *sharedController;
         if ( [df boolForKey:@"showRating"] ) {
             rating = ( [currentRemote currentSongRating] * 5 );
         }
         if ( [df boolForKey:@"showRating"] ) {
             rating = ( [currentRemote currentSongRating] * 5 );
         }
-
-        [statusWindowController showSongWindowWithTitle:title
-                                                  album:album
-                                                 artist:artist
-                                                   time:time
-                                            trackNumber:trackNumber
-                                             trackTotal:trackTotal
-                                                 rating:rating];
+        
     } else {
     } else {
-        title = @"No song is playing.";
-        [statusWindowController showSongWindowWithTitle:title
-                                                  album:nil
-                                                 artist:nil
-                                                   time:nil
-                                            trackNumber:0
-                                             trackTotal:0
-                                                 rating:0];
+        title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
     }
     }
+
+    [statusWindowController showSongInfoWindowWithSource:source
+                                                   title:title
+                                                   album:album
+                                                  artist:artist
+                                                    time:time
+                                             trackNumber:trackNumber
+                                              trackTotal:trackTotal
+                                                  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"];
@@ -440,13 +522,115 @@ static MainController *sharedController;
             }
         }
         
             }
         }
         
-        [statusWindowController showUpcomingSongsWithTitles:songList];
+        [statusWindowController showUpcomingSongsWindowWithTitles:songList];
         
     } else {
         
     } else {
-        [statusWindowController showUpcomingSongsWithTitles:[NSArray arrayWithObject:@"No upcoming songs."]];
+        [statusWindowController showUpcomingSongsWindowWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];
     }
 }
 
     }
 }
 
+- (void)incrementVolume
+{
+    float volume  = [currentRemote volume];
+    float dispVol = volume;
+    ITDebugLog(@"Incrementing volume.");
+    volume  += 0.110;
+    dispVol += 0.100;
+    
+    if (volume > 1.0) {
+        volume  = 1.0;
+        dispVol = 1.0;
+    }
+
+    ITDebugLog(@"Setting volume to %f", volume);
+    [currentRemote setVolume:volume];
+
+    // Show volume status window
+    [statusWindowController showVolumeWindowWithLevel:dispVol];
+}
+
+- (void)decrementVolume
+{
+    float volume  = [currentRemote volume];
+    float dispVol = volume;
+    ITDebugLog(@"Decrementing volume.");
+    volume  -= 0.090;
+    dispVol -= 0.100;
+
+    if (volume < 0.0) {
+        volume  = 0.0;
+        dispVol = 0.0;
+    }
+    
+    ITDebugLog(@"Setting volume to %f", volume);
+    [currentRemote setVolume:volume];
+    
+    //Show volume status window
+    [statusWindowController showVolumeWindowWithLevel:dispVol];
+}
+
+- (void)incrementRating
+{
+    float rating = [currentRemote currentSongRating];
+    ITDebugLog(@"Incrementing rating.");
+    rating += 0.2;
+    if (rating > 1.0) {
+        rating = 1.0;
+    }
+    ITDebugLog(@"Setting rating to %f", rating);
+    [currentRemote setCurrentSongRating:rating];
+    
+    //Show rating status window
+    [statusWindowController showRatingWindowWithRating:rating];
+}
+
+- (void)decrementRating
+{
+    float rating = [currentRemote currentSongRating];
+    ITDebugLog(@"Decrementing rating.");
+    rating -= 0.2;
+    if (rating < 0.0) {
+        rating = 0.0;
+    }
+    ITDebugLog(@"Setting rating to %f", rating);
+    [currentRemote setCurrentSongRating:rating];
+    
+    //Show rating status window
+    [statusWindowController showRatingWindowWithRating:rating];
+}
+
+- (void)toggleLoop
+{
+    ITMTRemotePlayerRepeatMode repeatMode = [currentRemote repeatMode];
+    ITDebugLog(@"Toggling repeat mode.");
+    switch (repeatMode) {
+        case ITMTRemotePlayerRepeatOff:
+            repeatMode = ITMTRemotePlayerRepeatAll;
+        break;
+        case ITMTRemotePlayerRepeatAll:
+            repeatMode = ITMTRemotePlayerRepeatOne;
+        break;
+        case ITMTRemotePlayerRepeatOne:
+            repeatMode = ITMTRemotePlayerRepeatOff;
+        break;
+    }
+    ITDebugLog(@"Setting repeat mode to %i", repeatMode);
+    [currentRemote setRepeatMode:repeatMode];
+    
+    //Show loop status window
+    [statusWindowController showRepeatWindowWithMode:repeatMode];
+}
+
+- (void)toggleShuffle
+{
+    bool newShuffleEnabled = ![currentRemote shuffleEnabled];
+    ITDebugLog(@"Toggling shuffle mode.");
+    [currentRemote setShuffleEnabled:newShuffleEnabled];
+    //Show shuffle status window
+    ITDebugLog(@"Setting shuffle mode to %i", newShuffleEnabled);
+    [statusWindowController showRepeatWindowWithMode:newShuffleEnabled];
+}
+
 /*************************************************************************/
 #pragma mark -
 #pragma mark WORKSPACE NOTIFICATION HANDLERS
 /*************************************************************************/
 #pragma mark -
 #pragma mark WORKSPACE NOTIFICATION HANDLERS
@@ -455,8 +639,16 @@ 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];
         [self timerUpdate];
-        [NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
+        refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:0.5
+                             target:self
+                             selector:@selector(timerUpdate)
+                             userInfo:nil
+                             repeats:YES] retain];
+        //[NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
         [self setupHotKeys];
         playerRunningState = ITMTRemotePlayerRunning;
     }
         [self setupHotKeys];
         playerRunningState = ITMTRemotePlayerRunning;
     }
@@ -465,11 +657,13 @@ 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]]) {
-         [refreshTimer invalidate];
-         [refreshTimer release];
-         refreshTimer = nil;
-         [self clearHotKeys];
-         playerRunningState = ITMTRemotePlayerNotRunning;
+        ITDebugLog(@"Remote application terminated.");
+        [currentRemote halt];
+        [refreshTimer invalidate];
+        [refreshTimer release];
+        refreshTimer = nil;
+        [self clearHotKeys];
+        playerRunningState = ITMTRemotePlayerNotRunning;
      }
  }
 
      }
  }
 
@@ -493,13 +687,7 @@ static MainController *sharedController;
 
 - (void)dealloc
 {
 
 - (void)dealloc
 {
-    if (refreshTimer) {
-        [refreshTimer invalidate];
-        [refreshTimer release];
-        refreshTimer = nil;
-    }
-    
-    [currentRemote halt];
+    [self applicationTerminated:nil];
     [statusItem release];
     [statusWindowController release];
     [menuController release];
     [statusItem release];
     [statusWindowController release];
     [menuController release];
Menu-based iTunes controller.