X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/ce07e58f56b64ce6eea89ecbd66fa7bb8af57519..e8516aa003a65e030ec6f7c4007ed04efa351477:/MainController.m

diff --git a/MainController.m b/MainController.m
index 16738a3..692c409 100755
--- a/MainController.m
+++ b/MainController.m
@@ -1,4 +1,4 @@
-#import "NewMainController.h"
+#import "MainController.h"
 #import "MenuController.h"
 #import "PreferencesController.h"
 #import "HotKeyCenter.h"
@@ -7,7 +7,6 @@
 
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
-- (void)setupHotKeys;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (void)showCurrentTrackInfo;
@@ -72,7 +71,14 @@ static MainController *sharedController;
     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"]];
@@ -160,14 +166,8 @@ static MainController *sharedController;
 
 - (void)timerUpdate
 {
-    //This huge if statement is being nasty
-    /*if ( ( [self songChanged] ) ||
-         ( ([self radioIsPlaying]) && (latestPlaylistClass != ITMTRemotePlayerRadioPlaylist) ) ||
-         ( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) )*/
-    
     if ([self songChanged]) {
         [self setLatestSongIdentifier:[currentRemote currentSongUniqueIdentifier]];
-        latestPlaylistClass = [currentRemote currentPlaylistClass];
         [menuController rebuildSubmenus];
         
         if ( [df boolForKey:@"showSongInfoOnChange"] ) {
@@ -251,7 +251,7 @@ static MainController *sharedController;
         [currentRemote showPrimaryInterface];
     } else {
         if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) {
-            NSLog(@"Error Launching Player");
+            NSLog(@"MenuTunes: Error Launching Player");
         }
     }
 }
@@ -420,7 +420,7 @@ static MainController *sharedController;
                                              trackTotal:trackTotal
                                                  rating:rating];
     } else {
-        title = @"No song is playing.";
+        title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
         [statusWindowController showSongWindowWithTitle:title
                                                   album:nil
                                                  artist:nil
@@ -451,7 +451,7 @@ static MainController *sharedController;
         [statusWindowController showUpcomingSongsWithTitles:songList];
         
     } else {
-        [statusWindowController showUpcomingSongsWithTitles:[NSArray arrayWithObject:@"No upcoming songs."]];
+        [statusWindowController showUpcomingSongsWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];
     }
 }