X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/35486a7ded93b3e89a6b03ec1dbe801f3dfe0edc..479952e2cf104d1f984108c5b672d8fbb039eebe:/MenuTunes.m

diff --git a/MenuTunes.m b/MenuTunes.m
index a1121d7..0c08e20 100755
--- a/MenuTunes.m
+++ b/MenuTunes.m
@@ -1,12 +1,3 @@
-/*
-Things to do:
-¥ Make preferences window pretty
-¥ Optimize
-¥ Apple Events! Apple Events! Apple Events!
-¥ Manual and webpage
-¥ Finish up registration frontend
-*/
-
 #import "MenuTunes.h"
 #import "PreferencesController.h"
 #import "HotKeyCenter.h"
@@ -46,21 +37,20 @@ 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];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(remotePlayerTerminated:) name:@"ITMTRemoteAppDidTerminateNotification" object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(remotePlayerLaunched:) name:@"ITMTRemoteAppDidLaunchNotification" object:nil];
     
     [self registerDefaultsIfNeeded];
     
     menu = [[NSMenu alloc] initWithTitle:@""];
     
-    if ([currentRemote isAppRunning]) {
-        [self iTunesLaunched:nil];
+    if ( ( [currentRemote playerRunningState] == ITMTRemotePlayerRunning ) ) {
+        [self remotePlayerLaunched:nil];
     } else {
-        [self iTunesTerminated:nil];
+        [self remotePlayerTerminated:nil];
     }
     
-    statusItem = [[ITStatusItem alloc] initWithStatusBar:[NSStatusBar systemStatusBar]
-                                              withLength:NSSquareStatusItemLength];
+    statusItem = [[ITStatusItem alloc] initWithStatusBar:[NSStatusBar systemStatusBar] withLength:NSSquareStatusItemLength];
     
     [statusItem setImage:[NSImage imageNamed:@"menu"]];
     [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]];
@@ -93,14 +83,14 @@ Things to do:
             }
         }
 
-//      if ( [remoteArray count] > 0 ) {
+//      if ( [remoteArray count] > 0 ) {  // UNCOMMENT WHEN WE HAVE > 1 PLUGIN
 //          if ( [remoteArray count] > 1 ) {
 //              [remoteArray sortUsingSelector:@selector(sortAlpha:)];
 //          }
 //          [self loadModuleAccessUI]; //Comment out this line to disable remote visibility
 //      }
     }
-    NSLog(@"%@", [remoteArray objectAtIndex:0]);
+//  NSLog(@"%@", [remoteArray objectAtIndex:0]);  //DEBUG
     return [remoteArray objectAtIndex:0];
 }
 
@@ -129,6 +119,7 @@ Things to do:
                 @"<separator>",
                 @"Upcoming Songs",
                 @"Playlists",
+                @"Song Rating",
                 @"<separator>",
                 @"PreferencesÉ",
                 @"Quit",
@@ -209,6 +200,7 @@ Things to do:
     
     playPauseMenuItem = nil;
     upcomingSongsItem = nil;
+    songRatingMenuItem = nil;
     playlistItem = nil;
     [playlistMenu release];
     playlistMenu = nil;
@@ -287,6 +279,32 @@ Things to do:
             [menu addItemWithTitle:@"No Song"
                     action:nil
                     keyEquivalent:@""];
+        } else if ([item isEqualToString:@"Song Rating"]) {
+            NSMenuItem *item;
+            int i;
+            NSString *curTitle = @".....";
+            
+            songRatingMenuItem = [menu addItemWithTitle:@"Song Rating"
+                    action:nil
+                    keyEquivalent:@""];
+            
+            ratingMenu = [[NSMenu alloc] initWithTitle:@""];
+            
+            item = [ratingMenu addItemWithTitle:@"....."
+                            action:@selector(setSongRating:)
+                            keyEquivalent:@""];
+            [item setTarget:self];
+            [item setTag:0];
+            
+            for (i = 1; i < 6; i++) {
+                curTitle = [curTitle substringToIndex:4];
+                curTitle = [@"x" stringByAppendingString:curTitle];
+                item = [ratingMenu addItemWithTitle:curTitle
+                            action:@selector(setSongRating:)
+                            keyEquivalent:@""];
+                [item setTarget:self];
+                [item setTag:(i * 20)];
+            }
         } else if ([item isEqualToString:@"<separator>"]) {
             [menu addItem:[NSMenuItem separatorItem]];
         }
@@ -304,7 +322,7 @@ Things to do:
     NSMenuItem *menuItem;
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     
-    if (!isAppRunning) {
+    if ( ( isAppRunning == ITMTRemotePlayerNotRunning ) ) {
         return;
     }
     
@@ -319,7 +337,6 @@ Things to do:
     if (eqItem) {
         [self rebuildEQPresetsMenu];
     }
-    
     if (trackInfoIndex > -1) {
         NSString *curSongName, *curAlbumName = @"", *curArtistName = @"";
         curSongName = [currentRemote currentSongTitle];
@@ -373,6 +390,16 @@ Things to do:
                     [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
                     [menuItem release];
                 }
+                
+                if (songRatingMenuItem) {
+                    int rating = (int)[currentRemote currentSongRating] * 10;
+                    int i;
+                    for (i = 0; i < 5; i++) {
+                        [[ratingMenu itemAtIndex:i] setState:NSOffState];
+                        [[ratingMenu itemAtIndex:i] setTarget:self];
+                    }
+                    [[ratingMenu itemAtIndex:rating / 2] setState:NSOnState];
+                }
             }
             
             if ([defaults boolForKey:@"showName"]) {
@@ -388,6 +415,9 @@ Things to do:
                 [menu removeItemAtIndex:[menu indexOfItemWithTitle:@"No Song"]];
                 [menu insertItem:menuItem atIndex:trackInfoIndex];
                 [menuItem release];
+                
+                [songRatingMenuItem setSubmenu:ratingMenu];
+                [songRatingMenuItem setEnabled:YES];
             }
         } else if ([menu indexOfItemWithTitle:@"No Song"] == -1) {
             [menu removeItemAtIndex:trackInfoIndex];
@@ -421,6 +451,7 @@ Things to do:
             didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);
         }
     }
+    [menu update];
 }
 
 //Rebuild the upcoming songs submenu. Can be improved a lot.
@@ -495,6 +526,7 @@ Things to do:
 - (void)rebuildEQPresetsMenu
 {
     NSArray *eqPresets = [currentRemote eqPresets];
+    NSMenuItem *enabledItem;
     int i;
     
     if (eqMenu && ([[currentRemote eqPresets] count] == [eqMenu numberOfItems]))
@@ -503,6 +535,16 @@ Things to do:
     [eqMenu release];
     eqMenu = [[NSMenu alloc] initWithTitle:@""];
     
+    enabledItem = [eqMenu addItemWithTitle:@"Disabled"
+                          action:@selector(toggleEqualizer)
+                          keyEquivalent:@""];
+    
+    if ([currentRemote equalizerEnabled] == NO) {
+        [enabledItem setState:NSOnState];
+    }
+    
+    [eqMenu addItem:[NSMenuItem separatorItem]];
+    
     for (i = 0; i < [eqPresets count]; i++) {
         NSString *setName = [eqPresets objectAtIndex:i];
         NSMenuItem *tempItem;
@@ -516,7 +558,7 @@ Things to do:
     }
     [eqItem setSubmenu:eqMenu];
     
-    [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex] - 1] setState:NSOnState];
+    [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex] + 1] setState:NSOnState];
 }
 
 - (void)clearHotKeys
@@ -567,14 +609,14 @@ Things to do:
 - (void)timerUpdate
 {
     int playlist = [currentRemote currentPlaylistIndex];
-    PlayerState playerState = [currentRemote playerState];
+    ITMTRemotePlayerPlayingState playerPlayingState = [currentRemote playerPlayingState];
     
-    if ((playlist > 0) || playerState != stopped) {
+    if ((playlist > 0) || playerPlayingState != ITMTRemotePlayerStopped) {
         int trackPlayingIndex = [currentRemote currentSongIndex];
         
         if (trackPlayingIndex != lastSongIndex) {
             BOOL wasPlayingRadio = isPlayingRadio;
-            isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"];
+            isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist);
             
             if (isPlayingRadio && !wasPlayingRadio) {
                 int i;
@@ -597,7 +639,7 @@ Things to do:
         } else {
             if (playlist != lastPlaylistIndex) {
                 BOOL wasPlayingRadio = isPlayingRadio;
-                isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"];
+                isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist);
                 
                 if (isPlayingRadio && !wasPlayingRadio) {
                     int i;
@@ -628,41 +670,93 @@ Things to do:
         }
         //Update Play/Pause menu item
         if (playPauseMenuItem){
-            if (playerState == playing) {
+            if (playerPlayingState == ITMTRemotePlayerPlaying) {
                 [playPauseMenuItem setTitle:@"Pause"];
             } else {
                 [playPauseMenuItem setTitle:@"Play"];
             }
         }
+    } else if ((lastPlaylistIndex > 0) && (playlist == 0)) {
+        NSMenuItem *menuItem;
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        //Remote the now playing item and add no song item
+        [menu removeItemAtIndex:trackInfoIndex];
+        
+        if ([defaults boolForKey:@"showName"] == YES) {
+            [menu removeItemAtIndex:trackInfoIndex];
+        }
+        
+        if ([defaults boolForKey:@"showTime"] == YES) {
+            [menu removeItemAtIndex:trackInfoIndex];
+        }
+        
+        if (didHaveArtistName && [defaults boolForKey:@"showArtist"]) {
+            [menu removeItemAtIndex:trackInfoIndex];
+        }
+        
+        if (didHaveAlbumName && [defaults boolForKey:@"showAlbum"]) {
+            [menu removeItemAtIndex:trackInfoIndex];
+        }
+        
+        [playPauseMenuItem setTitle:@"Play"];
+        
+        didHaveArtistName = NO;
+        didHaveAlbumName = NO;
+        lastPlaylistIndex = -1;
+        lastSongIndex = -1;
+        
+        [upcomingSongsItem setSubmenu:nil];
+        [upcomingSongsItem setEnabled:NO];
+        
+        [songRatingMenuItem setSubmenu:nil];
+        [songRatingMenuItem setEnabled:NO];
+        
+        menuItem = [[NSMenuItem alloc] initWithTitle:@"No Song" action:nil keyEquivalent:@""];
+        [menu insertItem:menuItem atIndex:trackInfoIndex];
+        [menuItem release];
     }
 }
 
-- (void)iTunesLaunched:(NSNotification *)note
+- (void)remotePlayerLaunched:(NSNotification *)note
 {
-    isAppRunning = YES;
+    isAppRunning = ITMTRemotePlayerRunning;
     
     //Restart the timer
-    refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES]; 
+    [NSThread detachNewThreadSelector:@selector(runTimerInNewThread) toTarget:self withObject:nil];
     
     [self rebuildMenu]; //Rebuild the menu since no songs will be playing
-    [self rebuildPlaylistMenu];
+    if (playlistItem) {
+        [self rebuildPlaylistMenu];
+    }
+    if (eqItem) {
+        [self rebuildEQPresetsMenu];
+    }
     [statusItem setMenu:menu]; //Set the menu back to the main one
 }
 
-- (void)iTunesTerminated:(NSNotification *)note
+- (void)runTimerInNewThread
 {
-    isAppRunning = NO;
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
+    refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES] retain];
+    [runLoop run];
+    [pool release];
+}
+
+- (void)remotePlayerTerminated:(NSNotification *)note
+{
+    isAppRunning = ITMTRemotePlayerNotRunning;
     
     [menu release];
     menu = [[NSMenu alloc] initWithTitle:@""];
-    [menu addItemWithTitle:@"Audio Player" action:NULL keyEquivalent:@""];
-    [menu addItemWithTitle:@"Not Running" action:NULL keyEquivalent:@""];
+    [[menu addItemWithTitle:[NSString stringWithFormat:@"Open %@", [currentRemote playerSimpleName]] action:@selector(showPlayer:) keyEquivalent:@""] setTarget:self];
     [menu addItem:[NSMenuItem separatorItem]];
     [[menu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
     [[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
     [statusItem setMenu:menu];
     
     [refreshTimer invalidate];
+    [refreshTimer release];
     refreshTimer = nil;
     [self clearHotKeys];
 }
@@ -678,7 +772,6 @@ Things to do:
 - (void)playTrack:(id)sender
 {
     [currentRemote switchToSongAtIndex:[[sender representedObject] intValue]];
-    [self updateMenu];
 }
 
 - (void)selectPlaylist:(id)sender
@@ -686,7 +779,9 @@ Things to do:
     int playlist = [[sender representedObject] intValue];
     if (!isPlayingRadio) {
         int curPlaylist = [currentRemote currentPlaylistIndex];
-        [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOffState];
+        if (curPlaylist > 0) {
+            [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOffState];
+        }
     }
     [currentRemote switchToPlaylistAtIndex:playlist];
     [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState];
@@ -698,18 +793,18 @@ Things to do:
     int curSet = [currentRemote currentEQPresetIndex];
     int item = [[sender representedObject] intValue];
     [currentRemote switchToEQAtIndex:item];
-    [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState];
-    [[eqMenu itemAtIndex:item - 1] setState:NSOnState];
+    [[eqMenu itemAtIndex:curSet + 1] setState:NSOffState];
+    [[eqMenu itemAtIndex:item + 2] setState:NSOnState];
 }
 
 - (void)playPause:(id)sender
 {
-    PlayerState state = [currentRemote playerState];
+    ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState];
     
-    if (state == playing) {
+    if (state == ITMTRemotePlayerPlaying) {
         [currentRemote pause];
         [playPauseMenuItem setTitle:@"Play"];
-    } else if ((state == forwarding) || (state == rewinding)) {
+    } else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) {
         [currentRemote pause];
         [currentRemote play];
     } else {
@@ -730,7 +825,7 @@ Things to do:
 
 - (void)fastForward:(id)sender
 {
-    [currentRemote fastForward];
+    [currentRemote forward];
     [playPauseMenuItem setTitle:@"Play"];
 }
 
@@ -740,6 +835,18 @@ Things to do:
     [playPauseMenuItem setTitle:@"Play"];
 }
 
+- (void)toggleEqualizer
+{
+    [currentRemote setEqualizerEnabled:![currentRemote equalizerEnabled]];
+}
+
+- (void)setSongRating:(id)sender
+{
+    NSLog(@"%f", [currentRemote currentSongRating]);
+    NSLog(@"%f", (float)[sender tag] / 100.0);
+    [currentRemote setCurrentSongRating:(float)[sender tag] / 100.0];
+}
+
 //
 //
 // Plugin independent selectors
@@ -760,13 +867,25 @@ Things to do:
 
 - (void)closePreferences
 {
-    if (isAppRunning) {
+    if ( ( isAppRunning == ITMTRemotePlayerRunning) ) {
         [self setupHotKeys];
     }
     [prefsController release];
     prefsController = nil;
 }
 
+- (void)showPlayer:(id)sender
+{
+    if ( ( isAppRunning == ITMTRemotePlayerRunning) ) {
+        [currentRemote showPrimaryInterface];
+    } else {
+        if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) {
+            NSLog(@"Error Launching Player");
+        }
+    }
+}
+        
+
 //
 //
 // Show Current Track Info And Show Upcoming Songs Floaters
@@ -1057,6 +1176,7 @@ Things to do:
 {
     if (refreshTimer) {
         [refreshTimer invalidate];
+        [refreshTimer release];
         refreshTimer = nil;
     }
     [currentRemote halt];