Volume Window s3x. Auto-displayed song info is disabled right now. Will thread...

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index eacfd0d..7a0c29a 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


@@ -424,12 +442,13 @@ static MainController *sharedController;
     NSString *title = [currentRemote currentSongTitle];
 
     if ( title ) {
     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];
 
         if ( [df boolForKey:@"showAlbum"] ) {
             album = [currentRemote currentSongAlbum];


@@ -458,7 +477,8 @@ static MainController *sharedController;
                                                    time:time
                                             trackNumber:trackNumber
                                              trackTotal:trackTotal
                                                    time:time
                                             trackNumber:trackNumber
                                              trackTotal:trackTotal

-                                                 rating:rating];
+                                                 rating:rating
+                                                 source:source];

     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
         [statusWindowController showSongWindowWithTitle:title
     } else {
         title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
         [statusWindowController showSongWindowWithTitle:title


@@ -467,7 +487,8 @@ static MainController *sharedController;
                                                    time:nil
                                             trackNumber:0
                                              trackTotal:0
                                                    time:nil
                                             trackNumber:0
                                              trackTotal:0

-                                                 rating:0];
+                                                 rating:0
+                                                 source:[currentRemote currentSource]];

     }
 }
 
     }
 }
 


@@ -497,28 +518,40 @@ static MainController *sharedController;
 
 - (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