git.ithinksw.org / MenuTunes.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update iTunesRemote to match the new API. MainController and
[MenuTunes.git] / MainController.m
diff --git a/MainController.m b/MainController.m
index 475a23e..692c409 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -1,14 +1,17 @@
-#import "NewMainController.h"
+#import "MainController.h"
+#import "MenuController.h"
 #import "PreferencesController.h"
 #import "HotKeyCenter.h"
 #import "StatusWindowController.h"
 #import "PreferencesController.h"
 #import "HotKeyCenter.h"
 #import "StatusWindowController.h"
+#import "StatusItemHack.h"
 
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
 
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
-- (void)setupHotKeys;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (void)showCurrentTrackInfo;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (void)showCurrentTrackInfo;
+- (void)applicationLaunched:(NSNotification *)note;
+- (void)applicationTerminated:(NSNotification *)note;
 @end
 
 static MainController *sharedController;
 @end
 
 static MainController *sharedController;
@@ -32,8 +35,8 @@ static MainController *sharedController;
         
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
         statusWindowController = [[StatusWindowController alloc] init];
         
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
         statusWindowController = [[StatusWindowController alloc] init];
+        menuController = [[MenuController alloc] init];
         df = [[NSUserDefaults standardUserDefaults] retain];
         df = [[NSUserDefaults standardUserDefaults] retain];
-        [self setLatestSongIdentifier:@"0-0"];
     }
     return self;
 }
     }
     return self;
 }
@@ -55,15 +58,29 @@ static MainController *sharedController;
             selector:@selector(applicationLaunched:)
             name:NSWorkspaceDidLaunchApplicationNotification
             object:nil];
             selector:@selector(applicationLaunched:)
             name:NSWorkspaceDidLaunchApplicationNotification
             object:nil];
-
+    
     if ( ! [df objectForKey:@"menu"] ) {  // If this is nil, defaults have never been registered.
         [[PreferencesController sharedPrefs] registerDefaults];
     }
     
     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];
     
     statusItem = [[ITStatusItem alloc]
             initWithStatusBar:[NSStatusBar systemStatusBar]
             withLength:NSSquareStatusItemLength];
     
+    if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) {
+        [self applicationLaunched:nil];
+    } else {
+        if ([df boolForKey:@"LaunchPlayerWithMT"])
+        {
+            [self showPlayer];
+        }
+        else
+        {
+            [self applicationTerminated:nil];
+        }
+    }
+    
     [statusItem setImage:[NSImage imageNamed:@"menu"]];
     [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]];
 }
     [statusItem setImage:[NSImage imageNamed:@"menu"]];
     [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]];
 }
@@ -149,27 +166,23 @@ static MainController *sharedController;
 
 - (void)timerUpdate
 {
 
 - (void)timerUpdate
 {
-    if ( ( [self songChanged] ) ||
-         ( ([self radioIsPlaying]) && (latestPlaylistClass != ITMTRemotePlayerRadioPlaylist) ) ||
-         ( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) ) {
-        //[statusItem setMenu:[self menu]];
+    if ([self songChanged]) {
         [self setLatestSongIdentifier:[currentRemote currentSongUniqueIdentifier]];
         [self setLatestSongIdentifier:[currentRemote currentSongUniqueIdentifier]];
-        latestPlaylistClass = [currentRemote currentPlaylistClass];
+        [menuController rebuildSubmenus];
         
         if ( [df boolForKey:@"showSongInfoOnChange"] ) {
             [self showCurrentTrackInfo];
         }
     }
         
         if ( [df boolForKey:@"showSongInfoOnChange"] ) {
             [self showCurrentTrackInfo];
         }
     }
-/*    
-    //Update Play/Pause menu item
-    if (playPauseItem){
-        if ([currentRemote playerPlayingState] == ITMTRemotePlayerPlaying) {
-            [playPauseItem setTitle:@"Pause"];
-        } else {
-            [playPauseItem setTitle:@"Play"];
-        }
+}
+
+- (void)menuClicked
+{
+    if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) {
+        [statusItem setMenu:[menuController menu]];
+    } else {
+        [statusItem setMenu:[menuController menuForNoPlayer]];
     }
     }
-*/
 }
 
 //
 }
 
 //
@@ -232,6 +245,17 @@ static MainController *sharedController;
     [currentRemote switchToEQAtIndex:index];
 }
 
     [currentRemote switchToEQAtIndex:index];
 }
 
+- (void)showPlayer
+{
+    if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
+        [currentRemote showPrimaryInterface];
+    } else {
+        if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) {
+            NSLog(@"MenuTunes: Error Launching Player");
+        }
+    }
+}
+
 - (void)showPreferences
 {
     [[PreferencesController sharedPrefs] setController:self];
 - (void)showPreferences
 {
     [[PreferencesController sharedPrefs] setController:self];
@@ -246,17 +270,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) ) {
 - (void)closePreferences
 {
     if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
@@ -281,6 +294,7 @@ static MainController *sharedController;
     [[HotKeyCenter sharedCenter] removeHotKey:@"NextTrack"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"PrevTrack"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"TrackInfo"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"NextTrack"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"PrevTrack"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"TrackInfo"];
+    [[HotKeyCenter sharedCenter] removeHotKey:@"ShowPlayer"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"UpcomingSongs"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleLoop"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleShuffle"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"UpcomingSongs"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleLoop"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleShuffle"];
@@ -295,19 +309,25 @@ static MainController *sharedController;
     if ([df objectForKey:@"PlayPause"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"PlayPause"
                 combo:[df keyComboForKey:@"PlayPause"]
     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"]
     }
     
     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"]
     }
     
     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:@"ShowPlayer"] != nil) {
+        [[HotKeyCenter sharedCenter] addHotKey:@"ShowPlayer"
+                combo:[df keyComboForKey:@"ShowPlayer"]
+                target:self action:@selector(showPlayer)];
     }
     
     if ([df objectForKey:@"TrackInfo"] != nil) {
     }
     
     if ([df objectForKey:@"TrackInfo"] != nil) {
@@ -325,37 +345,37 @@ static MainController *sharedController;
     if ([df objectForKey:@"ToggleLoop"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"ToggleLoop"
                combo:[df keyComboForKey:@"ToggleLoop"]
     if ([df objectForKey:@"ToggleLoop"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"ToggleLoop"
                combo:[df keyComboForKey:@"ToggleLoop"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:@selector(toggleLoop)];
     }
     
     if ([df objectForKey:@"ToggleShuffle"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle"
                combo:[df keyComboForKey:@"ToggleShuffle"]
     }
     
     if ([df objectForKey:@"ToggleShuffle"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle"
                combo:[df keyComboForKey:@"ToggleShuffle"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:@selector(toggleShuffle)];
     }
     
     if ([df objectForKey:@"IncrementVolume"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume"
                combo:[df keyComboForKey:@"IncrementVolume"]
     }
     
     if ([df objectForKey:@"IncrementVolume"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume"
                combo:[df keyComboForKey:@"IncrementVolume"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:@selector(incrementVolume)];
     }
     
     if ([df objectForKey:@"DecrementVolume"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume"
                combo:[df keyComboForKey:@"DecrementVolume"]
     }
     
     if ([df objectForKey:@"DecrementVolume"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume"
                combo:[df keyComboForKey:@"DecrementVolume"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:@selector(decrementVolume)];
     }
     
     if ([df objectForKey:@"IncrementRating"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating"
                combo:[df keyComboForKey:@"IncrementRating"]
     }
     
     if ([df objectForKey:@"IncrementRating"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating"
                combo:[df keyComboForKey:@"IncrementRating"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:@selector(incrementRating)];
     }
     
     if ([df objectForKey:@"DecrementRating"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"DecrementRating"
                combo:[df keyComboForKey:@"DecrementRating"]
     }
     
     if ([df objectForKey:@"DecrementRating"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"DecrementRating"
                combo:[df keyComboForKey:@"DecrementRating"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:@selector(decrementRating)];
     }
 }
 
     }
 }
 
@@ -400,7 +420,7 @@ static MainController *sharedController;
                                              trackTotal:trackTotal
                                                  rating:rating];
     } else {
                                              trackTotal:trackTotal
                                                  rating:rating];
     } else {
-        title = @"No song is playing.";
+        title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
         [statusWindowController showSongWindowWithTitle:title
                                                   album:nil
                                                  artist:nil
         [statusWindowController showSongWindowWithTitle:title
                                                   album:nil
                                                  artist:nil
@@ -431,8 +451,89 @@ static MainController *sharedController;
         [statusWindowController showUpcomingSongsWithTitles:songList];
         
     } else {
         [statusWindowController showUpcomingSongsWithTitles:songList];
         
     } else {
-        [statusWindowController showUpcomingSongsWithTitles:[NSArray arrayWithObject:@"No upcoming songs."]];
+        [statusWindowController showUpcomingSongsWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];
+    }
+}
+
+- (void)incrementVolume
+{
+    float volume = [currentRemote volume];
+    volume += 0.2;
+    if (volume > 1.0) {
+        volume = 1.0;
+    }
+    [currentRemote setVolume:volume];
+    
+    //Show volume status window
+    [statusWindowController showVolumeWindowWithLevel:volume];
+}
+
+- (void)decrementVolume
+{
+    float volume = [currentRemote volume];
+    volume -= 0.2;
+    if (volume < 0.0) {
+        volume = 0.0;
+    }
+    [currentRemote setVolume:volume];
+    
+    //Show volume status window
+    [statusWindowController showVolumeWindowWithLevel:volume];
+}
+
+- (void)incrementRating
+{
+    float rating = [currentRemote currentSongRating];
+    rating += 0.2;
+    if (rating > 1.0) {
+        rating = 1.0;
     }
     }
+    [currentRemote setCurrentSongRating:rating];
+    
+    //Show rating status window
+    [statusWindowController showRatingWindowWithLevel:rating];
+}
+
+- (void)decrementRating
+{
+    float rating = [currentRemote currentSongRating];
+    rating -= 0.2;
+    if (rating < 0.0) {
+        rating = 0.0;
+    }
+    [currentRemote setCurrentSongRating:rating];
+    
+    //Show rating status window
+    [statusWindowController showRatingWindowWithLevel:rating];
+}
+
+- (void)toggleLoop
+{
+    ITMTRemotePlayerRepeatMode repeatMode = [currentRemote repeatMode];
+    
+    switch (repeatMode) {
+        case ITMTRemotePlayerRepeatOff:
+            repeatMode = ITMTRemotePlayerRepeatAll;
+        break;
+        case ITMTRemotePlayerRepeatAll:
+            repeatMode = ITMTRemotePlayerRepeatOne;
+        break;
+        case ITMTRemotePlayerRepeatOne:
+            repeatMode = ITMTRemotePlayerRepeatOff;
+        break;
+    }
+    [currentRemote setRepeatMode:repeatMode];
+    
+    //Show loop status window
+    [statusWindowController showLoopWindowWithMode:repeatMode];
+}
+
+- (void)toggleShuffle
+{
+    bool newShuffleEnabled = ![currentRemote shuffleEnabled];
+    [currentRemote setShuffleEnabled:newShuffleEnabled];
+    //Show shuffle status window
+    [statusWindowController showLoopWindowWithMode:newShuffleEnabled];
 }
 
 /*************************************************************************/
 }
 
 /*************************************************************************/
@@ -443,7 +544,15 @@ static MainController *sharedController;
 - (void)applicationLaunched:(NSNotification *)note
 {
     if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
 - (void)applicationLaunched:(NSNotification *)note
 {
     if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
-        [NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
+        [currentRemote begin];
+        [self setLatestSongIdentifier:@""];
+        [self timerUpdate];
+        refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:0.5
+                             target:self
+                             selector:@selector(timerUpdate)
+                             userInfo:nil
+                             repeats:YES] retain];
+        //[NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
         [self setupHotKeys];
         playerRunningState = ITMTRemotePlayerRunning;
     }
         [self setupHotKeys];
         playerRunningState = ITMTRemotePlayerRunning;
     }
@@ -452,20 +561,12 @@ static MainController *sharedController;
  - (void)applicationTerminated:(NSNotification *)note
  {
      if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
  - (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];
+        [refreshTimer invalidate];
+        [refreshTimer release];
+        refreshTimer = nil;
+        [self clearHotKeys];
+        playerRunningState = ITMTRemotePlayerNotRunning;
      }
  }
 
      }
  }
 
@@ -489,17 +590,12 @@ static MainController *sharedController;
 
 - (void)dealloc
 {
 
 - (void)dealloc
 {
-    if (refreshTimer) {
-        [refreshTimer invalidate];
-        [refreshTimer release];
-        refreshTimer = nil;
-    }
-    
-    [currentRemote halt];
+    [self applicationTerminated:nil];
     [statusItem release];
     [statusWindowController release];
     [statusItem release];
     [statusWindowController release];
+    [menuController release];
     [super dealloc];
 }
 
 
     [super dealloc];
 }
 
 
-@end
+@end
\ No newline at end of file
Menu-based iTunes controller.