Added more to MenuController
[MenuTunes.git] / MainController.m
index f0ee9ad..48ec66a 100755 (executable)
@@ -1,16 +1,30 @@
 #import "NewMainController.h"
+#import "MenuController.h"
 #import "PreferencesController.h"
 #import "HotKeyCenter.h"
 #import "StatusWindowController.h"
+#import "StatusItemHack.h"
 
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
 - (void)setupHotKeys;
 - (void)timerUpdate;
+- (void)setLatestSongIdentifier:(NSString *)newIdentifier;
+- (void)showCurrentTrackInfo;
+
+- (void)applicationLaunched:(NSNotification *)note;
+- (void)applicationTerminated:(NSNotification *)note;
 @end
 
+static MainController *sharedController;
+
 @implementation MainController
 
++ (MainController *)sharedController
+{
+    return sharedController;
+}
+
 /*************************************************************************/
 #pragma mark -
 #pragma mark INITIALIZATION/DEALLOCATION METHODS
 - (id)init
 {
     if ( ( self = [super init] ) ) {
+        sharedController = self;
+        
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
         statusWindowController = [[StatusWindowController alloc] init];
+        menuController = [[MenuController alloc] init];
         df = [[NSUserDefaults standardUserDefaults] retain];
         [self setLatestSongIdentifier:@"0-0"];
     }
             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"]];
 }
 
 - (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"];
-        }
-    }
-*/
 }
 
-/*
 //
 //
 // Menu Selectors
 //
 //
 
-- (void)selectSong:(id)sender
-{
-    [currentRemote switchToSongAtIndex:[[sender representedObject] intValue]];
-}
-*/
-- (void)selectPlaylist:(id)sender
-{
-    int playlist = [sender tag];
-    [currentRemote switchToPlaylistAtIndex:playlist];
-}
-/*
-- (void)selectEQPreset:(id)sender
-{
-    int curSet = [currentRemote currentEQPresetIndex];
-    int item = [sender tag];
-    
-    [currentRemote switchToEQAtIndex:item];
-    [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState];
-    [[eqMenu itemAtIndex:item] setState:NSOnState];
-}
-*/
-/*
-- (void)selectSongRating:(id)sender
-{
-    int newRating = [sender tag];
-//  [[ratingMenu itemAtIndex:lastSongRating] setState:NSOffState];
-    [sender setState:NSOnState];
-    [currentRemote setCurrentSongRating:(float)newRating / 100.0];
-    lastSongRating = newRating / 20;
-}
-*/
-/*
-- (void)playPause:(id)sender
+- (void)playPause
 {
     ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState];
     
     if (state == ITMTRemotePlayerPlaying) {
         [currentRemote pause];
-        [playPauseItem setTitle:@"Play"];
     } else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) {
         [currentRemote pause];
         [currentRemote play];
     } else {
         [currentRemote play];
-        [playPauseItem setTitle:@"Pause"];
     }
 }
 
-- (void)nextSong:(id)sender
+- (void)nextSong
 {
     [currentRemote goToNextSong];
 }
 
-- (void)prevSong:(id)sender
+- (void)prevSong
 {
     [currentRemote goToPreviousSong];
 }
 
-- (void)fastForward:(id)sender
+- (void)fastForward
 {
     [currentRemote forward];
-    [playPauseItem setTitle:@"Play"];
 }
 
-- (void)rewind:(id)sender
+- (void)rewind
 {
     [currentRemote rewind];
-    [playPauseItem setTitle:@"Play"];
 }
-*/
 
-//
-//
-- (void)quitMenuTunes:(id)sender
+- (void)selectPlaylistAtIndex:(int)index
 {
-    [NSApp terminate:self];
+    [currentRemote switchToPlaylistAtIndex:index];
+}
+
+- (void)selectSongAtIndex:(int)index
+{
+    [currentRemote switchToSongAtIndex:index];
+}
+
+- (void)selectSongRating:(int)rating
+{
+    [currentRemote setCurrentSongRating:(float)rating / 100.0];
+}
+
+- (void)selectEQPresetAtIndex:(int)index
+{
+    [currentRemote switchToEQAtIndex:index];
 }
 
-- (void)showPlayer:(id)sender
+- (void)showPlayer
 {
     if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
         [currentRemote showPrimaryInterface];
     }
 }
 
-- (void)showPreferences:(id)sender
+- (void)showPreferences
 {
     [[PreferencesController sharedPrefs] setController:self];
     [[PreferencesController sharedPrefs] showPrefsWindow:self];
 }
 
+- (void)quitMenuTunes
+{
+    [NSApp terminate:self];
+}
+
+//
+//
+
 - (void)closePreferences
 {
     if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
     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) {
                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
  - (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]];
      }
  }
 
     [currentRemote halt];
     [statusItem release];
     [statusWindowController release];
+    [menuController release];
     [super dealloc];
 }
 
 
-@end
+@end
\ No newline at end of file