Incremental checkin. Updating the StatusWindow and WtatusWindowController objects...

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index eacfd0d..517c892 100755 (executable)
--- 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
 }
 
 - (ITMTRemote *)loadRemote


@@ -173,13 +173,13 @@ static MainController *sharedController;
          ( ([self radioIsPlaying]) && (latestPlaylistClass != ITMTRemotePlayerRadioPlaylist) ) ||
          ( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) )*/
     
          ( ([self radioIsPlaying]) && (latestPlaylistClass != ITMTRemotePlayerRadioPlaylist) ) ||
          ( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) )*/
     

-    if ([self songChanged]) {
+    if ( [self songChanged] ) {

         [self setLatestSongIdentifier:[currentRemote playerStateUniqueIdentifier]];
         latestPlaylistClass = [currentRemote currentPlaylistClass];
         [menuController rebuildSubmenus];
         [self setLatestSongIdentifier:[currentRemote playerStateUniqueIdentifier]];
         latestPlaylistClass = [currentRemote currentPlaylistClass];
         [menuController rebuildSubmenus];

-        
+

         if ( [df boolForKey:@"showSongInfoOnChange"] ) {
         if ( [df boolForKey:@"showSongInfoOnChange"] ) {

-            [self showCurrentTrackInfo];
+//            [self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];

         }
     }
 }
         }
     }
 }


@@ -211,46 +211,64 @@ static MainController *sharedController;
     } else {
         [currentRemote play];
     }
     } else {
         [currentRemote play];
     }

+    
+    [self timerUpdate];

 }
 
 - (void)nextSong
 {
     [currentRemote goToNextSong];
 }
 
 - (void)nextSong
 {
     [currentRemote goToNextSong];

+    
+    [self timerUpdate];

 }
 
 - (void)prevSong
 {
     [currentRemote goToPreviousSong];
 }
 
 - (void)prevSong
 {
     [currentRemote goToPreviousSong];

+    
+    [self timerUpdate];

 }
 
 - (void)fastForward
 {
     [currentRemote forward];
 }
 
 - (void)fastForward
 {
     [currentRemote forward];

+    
+    [self timerUpdate];

 }
 
 - (void)rewind
 {
     [currentRemote rewind];
 }
 
 - (void)rewind
 {
     [currentRemote rewind];

+    
+    [self timerUpdate];

 }
 
 - (void)selectPlaylistAtIndex:(int)index
 {
     [currentRemote switchToPlaylistAtIndex:index];
 }
 
 - (void)selectPlaylistAtIndex:(int)index
 {
     [currentRemote switchToPlaylistAtIndex:index];

+    
+    [self timerUpdate];

 }
 
 - (void)selectSongAtIndex:(int)index
 {
     [currentRemote switchToSongAtIndex:index];
 }
 
 - (void)selectSongAtIndex:(int)index
 {
     [currentRemote switchToSongAtIndex:index];

+    
+    [self timerUpdate];

 }
 
 - (void)selectSongRating:(int)rating
 {
     [currentRemote setCurrentSongRating:(float)rating / 100.0];
 }
 
 - (void)selectSongRating:(int)rating
 {
     [currentRemote setCurrentSongRating:(float)rating / 100.0];

+    
+    [self timerUpdate];

 }
 
 - (void)selectEQPresetAtIndex:(int)index
 {
     [currentRemote switchToEQAtIndex:index];
 }
 
 - (void)selectEQPresetAtIndex:(int)index
 {
     [currentRemote switchToEQAtIndex:index];

+    
+    [self timerUpdate];

 }
 
 - (void)showPlayer
 }
 
 - (void)showPlayer


@@ -421,15 +439,16 @@ static MainController *sharedController;
 
 - (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;
+    

     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];


@@ -451,24 +470,19 @@ 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 {
         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
+                                             trackNumber:trackNumber
+                                              trackTotal:trackTotal
+                                                  rating:rating];

 }
 
 - (void)showUpcomingSongs
 }
 
 - (void)showUpcomingSongs


@@ -488,37 +502,49 @@ 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;
+    
+    volume  += 0.110;
+    dispVol += 0.100;
+    

     if (volume > 1.0) {
     if (volume > 1.0) {

-        volume = 1.0;
+        volume  = 1.0;
+        dispVol = 1.0;

     }
     }

+

     [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;
+    
+    volume  -= 0.090;
+    dispVol -= 0.100;
+

     if (volume < 0.0) {
     if (volume < 0.0) {

-        volume = 0.0;
+        volume  = 0.0;
+        dispVol = 0.0;

     }
     }

+    

     [currentRemote setVolume:volume];
     
     //Show volume status window
     [currentRemote setVolume:volume];
     
     //Show volume status window

-    [statusWindowController showVolumeWindowWithLevel:volume];
+    [statusWindowController showVolumeWindowWithLevel:dispVol];

 }
 
 - (void)incrementRating
 }
 
 - (void)incrementRating


@@ -531,7 +557,7 @@ static MainController *sharedController;
     [currentRemote setCurrentSongRating:rating];
     
     //Show rating status window
     [currentRemote setCurrentSongRating:rating];
     
     //Show rating status window

-    [statusWindowController showRatingWindowWithLevel:rating];
+    [statusWindowController showRatingWindowWithRating:rating];

 }
 
 - (void)decrementRating
 }
 
 - (void)decrementRating


@@ -544,7 +570,7 @@ static MainController *sharedController;
     [currentRemote setCurrentSongRating:rating];
     
     //Show rating status window
     [currentRemote setCurrentSongRating:rating];
     
     //Show rating status window

-    [statusWindowController showRatingWindowWithLevel:rating];
+    [statusWindowController showRatingWindowWithRating:rating];

 }
 
 - (void)toggleLoop
 }
 
 - (void)toggleLoop


@@ -565,7 +591,7 @@ static MainController *sharedController;
     [currentRemote setRepeatMode:repeatMode];
     
     //Show loop status window
     [currentRemote setRepeatMode:repeatMode];
     
     //Show loop status window

-    [statusWindowController showLoopWindowWithMode:repeatMode];
+    [statusWindowController showRepeatWindowWithMode:repeatMode];

 }
 
 - (void)toggleShuffle
 }
 
 - (void)toggleShuffle


@@ -573,7 +599,7 @@ static MainController *sharedController;
     bool newShuffleEnabled = ![currentRemote shuffleEnabled];
     [currentRemote setShuffleEnabled:newShuffleEnabled];
     //Show shuffle status window
     bool newShuffleEnabled = ![currentRemote shuffleEnabled];
     [currentRemote setShuffleEnabled:newShuffleEnabled];
     //Show shuffle status window

-    [statusWindowController showLoopWindowWithMode:newShuffleEnabled];
+    [statusWindowController showRepeatWindowWithMode:newShuffleEnabled];

 }
 
 /*************************************************************************/
 }
 
 /*************************************************************************/