X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/8c2086efaf1ee7419fc91275fdc7426de3fbe7fd..7bc6c0f1e85a6460ae61a80a80f974931924ec48:/MenuTunes.m?ds=sidebyside

diff --git a/MenuTunes.m b/MenuTunes.m
index ca96f36..477201e 100755
--- a/MenuTunes.m
+++ b/MenuTunes.m
@@ -47,8 +47,11 @@ Things to do:
     currentRemote = [self loadRemote];
     [currentRemote begin];
     
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(iTunesTerminated:) name:@"ITMTRemoteAppDidTerminateNotification" object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(iTunesLaunched:) name:@"ITMTRemoteAppDidLaunchNotification" object:nil];
+    
     asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
-
+    
     [self registerDefaultsIfNeeded];
     
     menu = [[NSMenu alloc] initWithTitle:@""];
@@ -62,8 +65,6 @@ Things to do:
                             selector:@selector(timerUpdate)
                             userInfo:nil
                             repeats:YES];
-        
-        [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesTerminated:) name:NSWorkspaceDidTerminateApplicationNotification object:nil];
     }
     else
     {
@@ -71,7 +72,6 @@ Things to do:
         [[menu addItemWithTitle:@"Open iTunes" action:@selector(openiTunes:) keyEquivalent:@""] setTarget:self];
         [[menu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
         [[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
-        [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil];
         refreshTimer = nil;
     }
 
@@ -209,9 +209,8 @@ Things to do:
     
     trackInfoIndex = -1;
     lastSongIndex = -1;
-    didHaveAlbumName = ([[self runScriptAndReturnResult:@"return album of current track"] length] > 0);
-    didHaveArtistName = ([[self runScriptAndReturnResult:@"return artist of current track"] length] > 0);
-    
+    didHaveAlbumName = ([[currentRemote currentSongAlbum] length] > 0);
+    didHaveArtistName = ([[currentRemote currentSongArtist] length] > 0);
     
     while ([menu numberOfItems] > 0) {
         [menu removeItemAtIndex:0];
@@ -365,7 +364,7 @@ Things to do:
             
             if (!isPlayingRadio) {
                 if ([defaults boolForKey:@"showTime"]) {
-                    menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", [self runScriptAndReturnResult:@"return time of current track"]]
+                    menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", [currentRemote currentSongLength]]
                                                         action:nil
                                                         keyEquivalent:@""];
                     [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
@@ -610,30 +609,11 @@ Things to do:
 //Called when the timer fires.
 - (void)timerUpdate
 {
-    int trackPlayingIndex = [currentRemote currentSongIndex];
-    int playlist = [currentRemote currentPlaylistIndex];
-    
-    if (trackPlayingIndex != lastSongIndex) {
-        bool wasPlayingRadio = isPlayingRadio;
-        isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"];
-        if (isPlayingRadio && !wasPlayingRadio) {
-            int i;
-            for (i = 0; i < [playlistMenu numberOfItems]; i++)
-            {
-                [[playlistMenu itemAtIndex:i] setState:NSOffState];
-            }
-        }
-        if (wasPlayingRadio) {
-            NSMenuItem *temp = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""];
-            [menu insertItem:temp atIndex:trackInfoIndex + 1];
-            [temp release];
-        }
-        [self updateMenu];
-        lastSongIndex = trackPlayingIndex;
-    }
-    else
-    {
-        if (playlist != [currentRemote currentPlaylistIndex]) {
+    if ([currentRemote playerState] != stopped) {
+        int trackPlayingIndex = [currentRemote currentSongIndex];
+        int playlist = [currentRemote currentPlaylistIndex];
+        
+        if (trackPlayingIndex != lastSongIndex) {
             bool wasPlayingRadio = isPlayingRadio;
             isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"];
             if (isPlayingRadio && !wasPlayingRadio) {
@@ -651,13 +631,34 @@ Things to do:
             [self updateMenu];
             lastSongIndex = trackPlayingIndex;
         }
-    }
-    //Update Play/Pause menu item
-    if (playPauseMenuItem){
-        if ([[self runScriptAndReturnResult:@"return player state"] isEqualToString:@"playing"]) {
-            [playPauseMenuItem setTitle:@"Pause"];
-        } else {
-            [playPauseMenuItem setTitle:@"Play"];
+        else
+        {
+            if (playlist != [currentRemote currentPlaylistIndex]) {
+                bool wasPlayingRadio = isPlayingRadio;
+                isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"];
+                if (isPlayingRadio && !wasPlayingRadio) {
+                    int i;
+                    for (i = 0; i < [playlistMenu numberOfItems]; i++)
+                    {
+                        [[playlistMenu itemAtIndex:i] setState:NSOffState];
+                    }
+                }
+                if (wasPlayingRadio) {
+                    NSMenuItem *temp = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""];
+                    [menu insertItem:temp atIndex:trackInfoIndex + 1];
+                    [temp release];
+                }
+                [self updateMenu];
+                lastSongIndex = trackPlayingIndex;
+            }
+        }
+        //Update Play/Pause menu item
+        if (playPauseMenuItem){
+            if ([currentRemote playerState] == playing) {
+                [playPauseMenuItem setTitle:@"Pause"];
+            } else {
+                [playPauseMenuItem setTitle:@"Play"];
+            }
         }
     }
 }
@@ -674,15 +675,10 @@ Things to do:
     
     [self rebuildMenu]; //Rebuild the menu since no songs will be playing
     [statusItem setMenu:menu]; //Set the menu back to the main one
-    [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
-    
-    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesTerminated:) name:NSWorkspaceDidTerminateApplicationNotification object:nil];
 }
 
 - (void)iTunesTerminated:(NSNotification *)note
 {
-    [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
-    
     [menu release];
     menu = [[NSMenu alloc] initWithTitle:@""];
     [[menu addItemWithTitle:@"Open iTunes" action:@selector(openiTunes:) keyEquivalent:@""] setTarget:self];
@@ -690,7 +686,6 @@ Things to do:
     [[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
     [statusItem setMenu:menu];
     
-    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil];
     [refreshTimer invalidate];
     refreshTimer = nil;
     [self clearHotKeys];
@@ -769,13 +764,11 @@ andEventID:(AEEventID)eventID
 
 - (void)playPause:(id)sender
 {
-    NSString *state = [self runScriptAndReturnResult:@"return player state"];
-    NSLog(@"%i", [currentRemote playerState]);
-    if ([state isEqualToString:@"playing"]) {
-        [currentRemote play];
+    PlayerState state = [currentRemote playerState];
+    if (state == playing) {
+        [currentRemote pause];
         [playPauseMenuItem setTitle:@"Play"];
-    } else if ([state isEqualToString:@"fast forwarding"] || [state 
-isEqualToString:@"rewinding"]) {
+    } else if ((state == forwarding) || (state == rewinding)) {
         [currentRemote play];
         [currentRemote pause];
     } else {
@@ -846,7 +839,7 @@ isEqualToString:@"rewinding"]) {
 
 - (void)showCurrentTrackInfo
 {
-    NSString *trackName = [self runScriptAndReturnResult:@"return name of current track"];
+    NSString *trackName = [currentRemote currentSongTitle];
     if (!statusController && [trackName length]) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         NSString *stringToShow = @"";
@@ -870,7 +863,6 @@ isEqualToString:@"rewinding"]) {
         
         if ([defaults boolForKey:@"showTime"]) {
             NSString *trackTime = [currentRemote currentSongLength];
-            NSLog(@"%@", trackTime);
             if ([trackTime length]) {
                 stringToShow = [NSString stringWithFormat:@"%@Total Time: %@\n", stringToShow, trackTime];
             }