X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/2413c9c1fe8cd8d9b4d0487d6354568a02727d7f..d0b1fa0c62ff0b511b3a4dc2bf77bf311f2eed94:/OldMainController.m

diff --git a/OldMainController.m b/OldMainController.m
index 6ac5ab4..8c6d514 100755
--- a/OldMainController.m
+++ b/OldMainController.m
@@ -49,7 +49,6 @@
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     currentRemote = [self loadRemote];
-    [currentRemote begin];
     
     //Setup for notification of the remote player launching or quitting
     [[[NSWorkspace sharedWorkspace] notificationCenter]
@@ -132,21 +131,10 @@
 - (void)applicationLaunched:(NSNotification *)note
 {
     if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
-        unichar fullstar = 0x2605;
-        unichar emptystar = 0x2606;
-        NSString *fullStarChar = [NSString stringWithCharacters:&fullstar length:1];
-        NSString *emptyStarChar = [NSString stringWithCharacters:&emptystar length:1];
-        //Build the song rating menu
-        ratingMenu = [[NSMenu alloc] initWithTitle:@""];
-        [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:0];
-        [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:20];
-        [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:40];
-        [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:60];
-        [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:80];
-        [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, fullStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:100];
+        [currentRemote begin];
+        [self timerUpdate];
         [NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
         [self setupHotKeys];
-        [self rebuildMenu];
         isAppRunning = ITMTRemotePlayerRunning;
     }
 }
@@ -157,18 +145,16 @@
         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:@""];
+        [notRunningMenu addItemWithTitle:@"Preferences..." action:@selector(showPreferences:) keyEquivalent:@""];
+        [[notRunningMenu addItemWithTitle:@"Quit" action:@selector(terminate:) keyEquivalent:@""] setTarget:NSApp];
+        [statusItem setMenu:[notRunningMenu autorelease]];
         
+        [currentRemote halt];
         [refreshTimer invalidate];
         [refreshTimer release];
         refreshTimer = nil;
         [self clearHotKeys];
         isAppRunning = ITMTRemotePlayerNotRunning;
-        
-        [ratingMenu release];
-        
-        [statusItem setMenu:[notRunningMenu autorelease]];
     }
 }
 
@@ -193,38 +179,57 @@
 //Recreate the status item menu
 - (void)rebuildMenu
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSArray *myMenu = [defaults arrayForKey:@"menu"];
-    int playlist = [currentRemote currentPlaylistIndex];
+    NSUserDefaults *defaults;
+    NSArray *myMenu;
+    int playlist;
     int i;
+    unichar fullstar = 0x2605;
+    unichar emptystar = 0x2606;
+    NSString *fullStarChar;
+    NSString *emptyStarChar;
     
     if ([currentRemote playerRunningState] == ITMTRemotePlayerNotRunning) {
         return;
     }
     
+    defaults = [NSUserDefaults standardUserDefaults];
+    myMenu = [defaults arrayForKey:@"menu"];
+    playlist = [currentRemote currentPlaylistIndex];
+    fullStarChar = [NSString stringWithCharacters:&fullstar length:1];
+    emptyStarChar = [NSString stringWithCharacters:&emptystar length:1];
+    
     trackInfoIndex = -1;
     lastPlaylistIndex = -1;
     
     [menu release];
     menu = [[NSMenu alloc] initWithTitle:@""];
     
+    //Release the old submenus
     playPauseItem = nil;
-    
     upcomingSongsItem = nil;
     [upcomingSongsMenu release];
     upcomingSongsMenu = nil;
-    
-    if (ratingItem) {
-        [ratingItem setSubmenu:nil];
-    }
-    
     playlistItem = nil;
     [playlistMenu release];
     playlistMenu = nil;
-    
     eqItem = nil;
     [eqMenu release];
     eqMenu = nil;
+    if (ratingItem) {
+        [ratingItem setSubmenu:nil];
+        [ratingItem release];
+        ratingItem = nil;
+    }
+    
+    //Build the rating menu
+    [ratingMenu release];
+    ratingMenu = [[NSMenu alloc] initWithTitle:@""];
+    [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:0];
+    [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:20];
+    [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:40];
+    [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:60];
+    [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:80];
+    [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, fullStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:100];
     
     //Build the custom menu
     for (i = 0; i < [myMenu count]; i++) {
@@ -294,18 +299,18 @@
                     action:@selector(showPreferences:)
                     keyEquivalent:@""];
         } else if ([item isEqualToString:@"Quit"]) {
-            [menu addItemWithTitle:@"Quit"
-                    action:@selector(quitMenuTunes:)
-                    keyEquivalent:@""];
+            [[menu addItemWithTitle:@"Quit"
+                    action:@selector(terminate:)
+                    keyEquivalent:@""] setTarget:NSApp];
         } else if ([item isEqualToString:@"Current Track Info"]) {
             trackInfoIndex = [menu numberOfItems];
             [menu addItemWithTitle:@"No Song"
                     action:nil
                     keyEquivalent:@""];
         } else if ([item isEqualToString:@"Song Rating"]) {
-            ratingItem = [menu addItemWithTitle:@"Song Rating"
+            ratingItem = [[menu addItemWithTitle:@"Song Rating"
                     action:nil
-                    keyEquivalent:@""];
+                    keyEquivalent:@""] retain];
             [ratingItem setSubmenu:ratingMenu];
         } else if ([item isEqualToString:@"<separator>"]) {
             [menu addItem:[NSMenuItem separatorItem]];
@@ -320,7 +325,7 @@
         [self rebuildEQPresetsMenu];
     }
     
-    isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist);
+    isPlayingRadio = ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist);
     
     if (upcomingSongsItem) {
         [self rebuildUpcomingSongsMenu];
@@ -331,7 +336,6 @@
             [ratingItem setEnabled:NO];
         } else {
             int currentSongRating = ([currentRemote currentSongRating] * 5);
-            [[ratingMenu itemAtIndex:lastSongRating] setState:NSOffState];
             lastSongRating = currentSongRating;
             [[ratingMenu itemAtIndex:lastSongRating] setState:NSOnState];
             [ratingItem setEnabled:YES];
@@ -393,7 +397,7 @@
         }
         
         if ([title length] > 0) {
-            [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", title] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+            [menu insertItemWithTitle:[NSString stringWithFormat:@"	 %@", title] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
         }
     }
     
@@ -492,7 +496,7 @@
 {
     int currentSongRating = ([currentRemote currentSongRating] * 5);
     if ([currentRemote currentPlaylistIndex] && (currentSongRating != lastSongRating)) {
-        if ([currentRemote classOfPlaylistAtIndex:[currentRemote currentPlaylistIndex]] == ITMTRemotePlayerRadioPlaylist) {
+        if ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist) {
             return;
         }
         [[ratingMenu itemAtIndex:lastSongRating] setState:NSOffState];
@@ -505,10 +509,11 @@
 {
     NSString *currentIdentifier = [currentRemote currentSongUniqueIdentifier];
     if (![lastSongIdentifier isEqualToString:currentIdentifier] ||
-       (!isPlayingRadio && ([currentRemote classOfPlaylistAtIndex:[currentRemote currentPlaylistIndex]] == ITMTRemotePlayerRadioPlaylist))) {
+       (!isPlayingRadio && ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist))) {
         //
         //
         // If we want to show the new track floater, do it here!
+        //[self showCurrentTrackInfoStatusWindow];
         //
         //
         [self rebuildMenu];
@@ -607,10 +612,6 @@
 
 //
 //
-- (void)quitMenuTunes:(id)sender
-{
-    [NSApp terminate:self];
-}
 
 - (void)showPlayer:(id)sender
 {
@@ -652,6 +653,7 @@
     [[HotKeyCenter sharedCenter] removeHotKey:@"PlayPause"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"NextTrack"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"PrevTrack"];
+    [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleVisualizer"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"TrackInfo"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"UpcomingSongs"];
     [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleLoop"];
@@ -684,62 +686,68 @@
                 target:self action:@selector(prevSong:)];
     }
     
+    if ([defaults objectForKey:@"ToggleVisualizer"] != nil) {
+        [[HotKeyCenter sharedCenter] addHotKey:@"ToggleVisualizer"
+                combo:[defaults keyComboForKey:@"ToggleVisualizer"]
+                target:self action:@selector(toggleVisualizer)];
+    }
+    
     if ([defaults objectForKey:@"TrackInfo"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"TrackInfo"
                 combo:[defaults keyComboForKey:@"TrackInfo"]
-                target:self action:@selector(showCurrentTrackInfo)];
+                target:self action:@selector(showCurrentTrackInfoStatusWindow)];
     }
     
     if ([defaults objectForKey:@"UpcomingSongs"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs"
                combo:[defaults keyComboForKey:@"UpcomingSongs"]
-               target:self action:@selector(showUpcomingSongs)];
+               target:self action:@selector(showUpcomingSongsStatusWindow)];
     }
     
     if ([defaults objectForKey:@"ToggleLoop"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"ToggleLoop"
                combo:[defaults keyComboForKey:@"ToggleLoop"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:@selector(showToggleLoopStatusWindow)];
     }
     
     if ([defaults objectForKey:@"ToggleShuffle"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle"
                combo:[defaults keyComboForKey:@"ToggleShuffle"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:@selector(showToggleShuffleStatusWindow)];
     }
     
     if ([defaults objectForKey:@"IncrementVolume"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume"
                combo:[defaults keyComboForKey:@"IncrementVolume"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:@selector(showVolumeIncrementStatusWindow)];
     }
     
     if ([defaults objectForKey:@"DecrementVolume"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume"
                combo:[defaults keyComboForKey:@"DecrementVolume"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:@selector(showVolumeDecrementStatusWindow)];
     }
     
     if ([defaults objectForKey:@"IncrementRating"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating"
                combo:[defaults keyComboForKey:@"IncrementRating"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:@selector(showRatingIncrementStatusWindow)];
     }
     
     if ([defaults objectForKey:@"DecrementRating"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"DecrementRating"
                combo:[defaults keyComboForKey:@"DecrementRating"]
-               target:self action:NULL/*Set this to something*/];
+               target:self action:@selector(showRatingDecrementStatusWindow)];
     }
 }
 
 //
 //
-// Show Current Track Info And Show Upcoming Songs Floaters
+// Status Window Methods
 //
 //
 
-- (void)showCurrentTrackInfo
+- (void)showCurrentTrackInfoStatusWindow
 {
     NSString *trackName = [currentRemote currentSongTitle];
     if (!statusWindow && [trackName length]) {
@@ -795,7 +803,7 @@
     }
 }
 
-- (void)showUpcomingSongs
+- (void)showUpcomingSongsStatusWindow
 {
     int curPlaylist = [currentRemote currentPlaylistIndex];
     if (!statusWindow) {
@@ -829,6 +837,35 @@
     }
 }
 
+- (void)showVolumeIncrementStatusWindow
+{
+}
+
+- (void)showVolumeDecrementStatusWindow
+{
+}
+
+- (void)showRatingIncrementStatusWindow
+{
+}
+
+- (void)showRatingDecrementStatusWindow
+{
+}
+
+- (void)showToggleLoopStatusWindow
+{
+}
+
+- (void)showToggleShuffleStatusWindow
+{
+}
+
+- (void)toggleVisualizer
+{
+    NSLog(@"Visualizer On/Off");
+}
+
 - (void)fadeAndCloseStatusWindow
 {
     [statusWindow orderOut:self];
@@ -869,16 +906,11 @@
         //Space -- ARGH!
         case 49:
         {
-            // Haven't tested this, though it should work.
-            unichar buffer;
-            [[NSString stringWithString:@"Space"] getCharacters:&buffer];
-            charcode = buffer;
             /*MenuRef menuRef = _NSGetCarbonMenu([item menu]);
-            NSLog(@"%@", menuRef);
-            SetMenuItemCommandKey(menuRef, 0, NO, 49);
-            SetMenuItemModifiers(menuRef, 0, kMenuNoCommandModifier);
-            SetMenuItemKeyGlyph(menuRef, 0, kMenuBlankGlyph);
-            charcode = 'b';*/
+            SetMenuItemCommandKey(menuRef, 1, NO, 49);
+            SetMenuItemModifiers(menuRef, 1, kMenuNoCommandModifier);
+            SetMenuItemKeyGlyph(menuRef, 1, kMenuBlankGlyph);*/
+            charcode = 'b';
             
         }
         break;