Added more to MenuController

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index 475a23e..48ec66a 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -1,7 +1,9 @@
 #import "NewMainController.h"
+#import "MenuController.h"
 #import "PreferencesController.h"
 #import "HotKeyCenter.h"
 #import "StatusWindowController.h"
+#import "StatusItemHack.h"
 
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
@@ -9,6 +11,9 @@
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (void)showCurrentTrackInfo;
+
+- (void)applicationLaunched:(NSNotification *)note;
+- (void)applicationTerminated:(NSNotification *)note;
 @end
 
 static MainController *sharedController;
@@ -32,6 +37,7 @@ static MainController *sharedController;
         
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
         statusWindowController = [[StatusWindowController alloc] init];
+        menuController = [[MenuController alloc] init];
         df = [[NSUserDefaults standardUserDefaults] retain];
         [self setLatestSongIdentifier:@"0-0"];
     }
@@ -55,15 +61,22 @@ static MainController *sharedController;
             selector:@selector(applicationLaunched:)
             name:NSWorkspaceDidLaunchApplicationNotification
             object:nil];
-
+    
     if ( ! [df objectForKey:@"menu"] ) {  // If this is nil, defaults have never been registered.
         [[PreferencesController sharedPrefs] registerDefaults];
     }
     
+    [StatusItemHack install];
     statusItem = [[ITStatusItem alloc]
             initWithStatusBar:[NSStatusBar systemStatusBar]
             withLength:NSSquareStatusItemLength];
     
+    if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) {
+        [self applicationLaunched:nil];
+    } else {
+        [self applicationTerminated:nil];
+    }
+    
     [statusItem setImage:[NSImage imageNamed:@"menu"]];
     [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]];
 }
@@ -149,27 +162,26 @@ static MainController *sharedController;
 
 - (void)timerUpdate
 {
-    if ( ( [self songChanged] ) ||
+    //We're quite worthless now, aren't we? Just used to showing the status windows.
+    /*if ( ( [self songChanged] ) ||
          ( ([self radioIsPlaying]) && (latestPlaylistClass != ITMTRemotePlayerRadioPlaylist) ) ||
          ( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) ) {
-        //[statusItem setMenu:[self menu]];
         [self setLatestSongIdentifier:[currentRemote currentSongUniqueIdentifier]];
         latestPlaylistClass = [currentRemote currentPlaylistClass];
         
         if ( [df boolForKey:@"showSongInfoOnChange"] ) {
             [self showCurrentTrackInfo];
         }
+    }*/
+}
+
+- (void)menuClicked
+{
+    if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) {
+        [statusItem setMenu:[menuController menu]];
+    } else {
+        [statusItem setMenu:[menuController menuForNoPlayer]];
     }
-/*    
-    //Update Play/Pause menu item
-    if (playPauseItem){
-        if ([currentRemote playerPlayingState] == ITMTRemotePlayerPlaying) {
-            [playPauseItem setTitle:@"Pause"];
-        } else {
-            [playPauseItem setTitle:@"Play"];
-        }
-    }
-*/
 }
 
 //
@@ -232,6 +244,17 @@ static MainController *sharedController;
     [currentRemote switchToEQAtIndex:index];
 }
 
+- (void)showPlayer
+{
+    if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
+        [currentRemote showPrimaryInterface];
+    } else {
+        if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) {
+            NSLog(@"Error Launching Player");
+        }
+    }
+}
+
 - (void)showPreferences
 {
     [[PreferencesController sharedPrefs] setController:self];
@@ -246,17 +269,6 @@ static MainController *sharedController;
 //
 //
 
-- (void)showPlayer:(id)sender
-{
-    if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
-        [currentRemote showPrimaryInterface];
-    } else {
-        if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) {
-            NSLog(@"Error Launching Player");
-        }
-    }
-}
-
 - (void)closePreferences
 {
     if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
@@ -295,19 +307,19 @@ static MainController *sharedController;
     if ([df objectForKey:@"PlayPause"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"PlayPause"
                 combo:[df keyComboForKey:@"PlayPause"]
-                target:self action:@selector(playPause:)];
+                target:self action:@selector(playPause)];
     }
     
     if ([df objectForKey:@"NextTrack"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"NextTrack"
                 combo:[df keyComboForKey:@"NextTrack"]
-                target:self action:@selector(nextSong:)];
+                target:self action:@selector(nextSong)];
     }
     
     if ([df objectForKey:@"PrevTrack"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"PrevTrack"
                 combo:[df keyComboForKey:@"PrevTrack"]
-                target:self action:@selector(prevSong:)];
+                target:self action:@selector(prevSong)];
     }
     
     if ([df objectForKey:@"TrackInfo"] != nil) {
@@ -322,41 +334,41 @@ static MainController *sharedController;
                target:self action:@selector(showUpcomingSongs)];
     }
     
-    if ([df objectForKey:@"ToggleLoop"] != nil) {
+/*    if ([df objectForKey:@"ToggleLoop"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"ToggleLoop"
                combo:[df keyComboForKey:@"ToggleLoop"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:NULL];
     }
     
     if ([df objectForKey:@"ToggleShuffle"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle"
                combo:[df keyComboForKey:@"ToggleShuffle"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:NULL];
     }
     
     if ([df objectForKey:@"IncrementVolume"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume"
                combo:[df keyComboForKey:@"IncrementVolume"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:NULL];
     }
     
     if ([df objectForKey:@"DecrementVolume"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume"
                combo:[df keyComboForKey:@"DecrementVolume"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:NULL];
     }
     
     if ([df objectForKey:@"IncrementRating"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating"
                combo:[df keyComboForKey:@"IncrementRating"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:NULL];
     }
     
     if ([df objectForKey:@"DecrementRating"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"DecrementRating"
                combo:[df keyComboForKey:@"DecrementRating"]
-               target:self action:NULL/*Set this to something*/];
-    }
+               target:self action:NULL];
+    }*/
 }
 
 - (void)showCurrentTrackInfo
@@ -452,20 +464,11 @@ static MainController *sharedController;
  - (void)applicationTerminated:(NSNotification *)note
  {
      if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
-/*
-         NSMenu *notRunningMenu = [[NSMenu alloc] initWithTitle:@""];
-         [notRunningMenu addItemWithTitle:[NSString stringWithFormat:@"Open %@", [currentRemote playerSimpleName]] action:@selector(showPlayer:) keyEquivalent:@""];
-         [notRunningMenu addItem:[NSMenuItem separatorItem]];
-         [notRunningMenu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""];
-         [notRunningMenu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""];
-*/
          [refreshTimer invalidate];
          [refreshTimer release];
          refreshTimer = nil;
          [self clearHotKeys];
          playerRunningState = ITMTRemotePlayerNotRunning;
-
-         [statusItem setMenu:[self menuForNoPlayer]];
      }
  }
 
@@ -498,8 +501,9 @@ static MainController *sharedController;
     [currentRemote halt];
     [statusItem release];
     [statusWindowController release];
+    [menuController release];
     [super dealloc];
 }
 
 
-@end
+@end
\ No newline at end of file