X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/6a84de24eb2e905de206250ee5b3a95041930713..e050f5301eec251a3dd3177007037bbaef7f8fd3:/MainController.m?ds=inline

diff --git a/MainController.m b/MainController.m
index f91975f..fd932be 100755
--- a/MainController.m
+++ b/MainController.m
@@ -83,8 +83,8 @@ static MainController *sharedController;
         }
     }
     
-    [statusItem setImage:[NSImage imageNamed:@"menu"]];
-    [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]];
+    [statusItem setImage:[NSImage imageNamed:@"MenuNormal"]];
+    [statusItem setAlternateImage:[NSImage imageNamed:@"MenuInverted"]];
 }
 
 - (ITMTRemote *)loadRemote
@@ -142,7 +142,7 @@ static MainController *sharedController;
 
 - (BOOL)songIsPlaying
 {
-    return ( ! ([[currentRemote currentSongUniqueIdentifier] isEqualToString:@"0-0"]) );
+    return ( ! ([[currentRemote playerStateUniqueIdentifier] isEqualToString:@"0-0"]) );
 }
 
 - (BOOL)radioIsPlaying
@@ -152,7 +152,7 @@ static MainController *sharedController;
 
 - (BOOL)songChanged
 {
-    return ( ! [[currentRemote currentSongUniqueIdentifier] isEqualToString:_latestSongIdentifier] );
+    return ( ! [[currentRemote playerStateUniqueIdentifier] isEqualToString:_latestSongIdentifier] );
 }
 
 - (NSString *)latestSongIdentifier
@@ -174,10 +174,10 @@ static MainController *sharedController;
          ( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) )*/
     
     if ([self songChanged]) {
-        [self setLatestSongIdentifier:[currentRemote currentSongUniqueIdentifier]];
+        [self setLatestSongIdentifier:[currentRemote playerStateUniqueIdentifier]];
         latestPlaylistClass = [currentRemote currentPlaylistClass];
         [menuController rebuildSubmenus];
-        
+
         if ( [df boolForKey:@"showSongInfoOnChange"] ) {
             [self showCurrentTrackInfo];
         }
@@ -211,46 +211,64 @@ static MainController *sharedController;
     } else {
         [currentRemote play];
     }
+    
+    [self timerUpdate];
 }
 
 - (void)nextSong
 {
     [currentRemote goToNextSong];
+    
+    [self timerUpdate];
 }
 
 - (void)prevSong
 {
     [currentRemote goToPreviousSong];
+    
+    [self timerUpdate];
 }
 
 - (void)fastForward
 {
     [currentRemote forward];
+    
+    [self timerUpdate];
 }
 
 - (void)rewind
 {
     [currentRemote rewind];
+    
+    [self timerUpdate];
 }
 
 - (void)selectPlaylistAtIndex:(int)index
 {
     [currentRemote switchToPlaylistAtIndex:index];
+    
+    [self timerUpdate];
 }
 
 - (void)selectSongAtIndex:(int)index
 {
     [currentRemote switchToSongAtIndex:index];
+    
+    [self timerUpdate];
 }
 
 - (void)selectSongRating:(int)rating
 {
     [currentRemote setCurrentSongRating:(float)rating / 100.0];
+    
+    [self timerUpdate];
 }
 
 - (void)selectEQPresetAtIndex:(int)index
 {
     [currentRemote switchToEQAtIndex:index];
+    
+    [self timerUpdate];
 }
 
 - (void)showPlayer
@@ -424,12 +442,13 @@ static MainController *sharedController;
     NSString *title = [currentRemote currentSongTitle];
 
     if ( title ) {
-        NSString *album       = nil;
-        NSString *artist      = nil;
-        NSString *time        = nil;
-        int       trackNumber = 0;
-        int       trackTotal  = 0;
-        int       rating      = 0;
+        NSString              *album       = nil;
+        NSString              *artist      = nil;
+        NSString              *time        = nil;
+        int                    trackNumber = 0;
+        int                    trackTotal  = 0;
+        int                    rating      = 0;
+        ITMTRemotePlayerSource source      = [currentRemote currentSource];
 
         if ( [df boolForKey:@"showAlbum"] ) {
             album = [currentRemote currentSongAlbum];
@@ -458,7 +477,8 @@ static MainController *sharedController;
                                                    time:time
                                             trackNumber:trackNumber
                                              trackTotal:trackTotal
-                                                 rating:rating];
+                                                 rating:rating
+                                                 source:source];
     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
         [statusWindowController showSongWindowWithTitle:title
@@ -467,7 +487,8 @@ static MainController *sharedController;
                                                    time:nil
                                             trackNumber:0
                                              trackTotal:0
-                                                 rating:0];
+                                                 rating:0
+                                                 source:[currentRemote currentSource]];
     }
 }