X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/a876619d0c610eaee6aa5e1a105106f265b2c084..8cd402b5d3e43c95046af7ac0e4cb3cde2d622bc:/MainController.m

diff --git a/MainController.m b/MainController.m
index 5819acd..9a8b493 100755
--- a/MainController.m
+++ b/MainController.m
@@ -768,7 +768,7 @@ static MainController *sharedController;
 {
     ITDebugLog(@"Show preferences.");
     [[PreferencesController sharedPrefs] showPrefsWindow:self];
-    [[StatusWindow sharedWindow] setLocked:NO];
+    [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
     [[StatusWindow sharedWindow] vanish:self];
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 }
@@ -975,6 +975,16 @@ static MainController *sharedController;
         [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
     }
     
+	if ([df objectForKey:@"ToggleShufflability"] != nil) {
+        ITDebugLog(@"Setting up toggle song shufflability hot key.");
+        hotKey = [[ITHotKey alloc] init];
+        [hotKey setName:@"ToggleShufflability"];
+        [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShufflability"]]];
+        [hotKey setTarget:self];
+        [hotKey setAction:@selector(toggleSongShufflable)];
+        [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+    }
+	
     if ([df objectForKey:@"PopupMenu"] != nil) {
         ITDebugLog(@"Setting up popup menu hot key.");
         hotKey = [[ITHotKey alloc] init];
@@ -1070,6 +1080,8 @@ static MainController *sharedController;
             NS_HANDLER
                 [self networkError:localException];
             NS_ENDHANDLER
+			_timeUpdateCount = 0;
+			[NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(updateTime:) userInfo:nil repeats:YES];
         }
 
         if ( [df boolForKey:@"showTrackNumber"] ) {
@@ -1126,6 +1138,23 @@ static MainController *sharedController;
                                                    image:art];
 }
 
+- (void)updateTime:(NSTimer *)timer
+{
+	_timeUpdateCount++;
+	if (_timeUpdateCount > (int)[df floatForKey:@"statusWindowVanishDelay"] - 1) {
+		NSString *time = nil;
+		NS_DURING
+			time = [NSString stringWithFormat:@"%@: %@ / %@",
+						NSLocalizedString(@"time", @"Time"),
+						[[self currentRemote] currentSongElapsed],
+						[[self currentRemote] currentSongLength]];
+			[[StatusWindowController sharedController] updateTime:time];
+		NS_HANDLER
+			[self networkError:localException];
+		NS_ENDHANDLER
+	}
+}
+
 - (void)showUpcomingSongs
 {
     int numSongs = 0;
@@ -1318,9 +1347,22 @@ static MainController *sharedController;
     NS_ENDHANDLER
 }
 
+- (void)toggleSongShufflable
+{
+	NS_DURING
+        BOOL flag = ![[self currentRemote] currentSongShufflable];
+        ITDebugLog(@"Toggling shufflability.");
+        [[self currentRemote] setCurrentSongShufflable:flag];
+        //Show song shufflability status window
+        //[statusWindowController showSongShuffabilityWindow:flag];
+    NS_HANDLER
+        [self networkError:localException];
+    NS_ENDHANDLER
+}
+
 - (void)registerNowOK
 {
-    [[StatusWindow sharedWindow] setLocked:NO];
+    [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
     [[StatusWindow sharedWindow] vanish:self];
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 
@@ -1329,7 +1371,7 @@ static MainController *sharedController;
 
 - (void)registerNowCancel
 {
-    [[StatusWindow sharedWindow] setLocked:NO];
+    [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
     [[StatusWindow sharedWindow] vanish:self];
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 
@@ -1484,14 +1526,14 @@ static MainController *sharedController;
         [NSTimer scheduledTimerWithTimeInterval:90.0 target:self selector:@selector(checkForRemoteServer) userInfo:nil repeats:NO];
     }*/
     [self checkForRemoteServerAndConnectImmediately:YES];
-    [[StatusWindow sharedWindow] setLocked:NO];
+    [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
     [[StatusWindow sharedWindow] vanish:self];
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 }
 
 - (void)cancelReconnect
 {
-    [[StatusWindow sharedWindow] setLocked:NO];
+    [(StatusWindow *)[StatusWindow sharedWindow] setLocked:NO];
     [[StatusWindow sharedWindow] vanish:self];
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 }