X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/a01e3db7219fd9c6401e3499551c80d2009135b5..4b426dd2e4cb2a9efccdba130dfaf86f735f58b5:/MenuTunes.m diff --git a/MenuTunes.m b/MenuTunes.m index 54f5768..3c96ed0 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" @@ -53,14 +44,13 @@ Things to do: menu = [[NSMenu alloc] initWithTitle:@""]; - if ([currentRemote isAppRunning]) { + if ( ( [currentRemote playerRunningState] == ITMTRemotePlayerRunning ) ) { [self remotePlayerLaunched:nil]; } else { [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"]]; @@ -210,6 +200,7 @@ Things to do: playPauseMenuItem = nil; upcomingSongsItem = nil; + songRatingMenuItem = nil; playlistItem = nil; [playlistMenu release]; playlistMenu = nil; @@ -289,31 +280,9 @@ Things to do: action:nil keyEquivalent:@""]; } else if ([item isEqualToString:@"Song Rating"]) { - NSMenu *ratingSubmenu = [[NSMenu alloc] initWithTitle:@""]; - unichar whiteStar = 'o';//2606; - unichar blackStar = 'x';//2605; - NSString *whiteStarString = [NSString stringWithCharacters:&whiteStar - length:1]; - NSString *blackStarString = [NSString stringWithCharacters:&blackStar - length:1]; - NSString *string = @""; - int i; - - for (i = 0; i < 5; i++) { - string = [string stringByAppendingString:whiteStarString]; - } - for (i = 0; i < 6; i++) { - NSMenuItem *ratingItem; - ratingItem = [ratingSubmenu addItemWithTitle:string action:@selector(setSongRating:) keyEquivalent:@""]; - [ratingItem setTarget:self]; - [ratingItem setTag:i * 20]; - string = [string substringToIndex:4]; - string = [blackStarString stringByAppendingString:string]; - } - [[menu addItemWithTitle:@"Song Rating" + songRatingMenuItem = [menu addItemWithTitle:@"Song Rating" action:nil - keyEquivalent:@""] setSubmenu:ratingSubmenu]; - [ratingSubmenu autorelease]; + keyEquivalent:@""]; } else if ([item isEqualToString:@""]) { [menu addItem:[NSMenuItem separatorItem]]; } @@ -331,7 +300,7 @@ Things to do: NSMenuItem *menuItem; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - if (!isAppRunning) { + if ( ( isAppRunning == ITMTRemotePlayerNotRunning ) ) { return; } @@ -346,7 +315,6 @@ Things to do: if (eqItem) { [self rebuildEQPresetsMenu]; } - if (trackInfoIndex > -1) { NSString *curSongName, *curAlbumName = @"", *curArtistName = @""; curSongName = [currentRemote currentSongTitle]; @@ -400,6 +368,36 @@ 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]; + } + + switch (rating) { + case 0: + [[ratingMenu itemAtIndex:5] setState:NSOnState]; + break; + case 2: + [[ratingMenu itemAtIndex:4] setState:NSOnState]; + break; + case 4: + [[ratingMenu itemAtIndex:3] setState:NSOnState]; + break; + case 6: + [[ratingMenu itemAtIndex:2] setState:NSOnState]; + break; + case 8: + [[ratingMenu itemAtIndex:1] setState:NSOnState]; + break; + case 10: + [[ratingMenu itemAtIndex:0] setState:NSOnState]; + break; + } + } } if ([defaults boolForKey:@"showName"]) { @@ -415,6 +413,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]; @@ -448,6 +449,7 @@ Things to do: didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO); } } + [menu update]; } //Rebuild the upcoming songs submenu. Can be improved a lot. @@ -522,6 +524,7 @@ Things to do: - (void)rebuildEQPresetsMenu { NSArray *eqPresets = [currentRemote eqPresets]; + NSMenuItem *enabledItem; int i; if (eqMenu && ([[currentRemote eqPresets] count] == [eqMenu numberOfItems])) @@ -530,6 +533,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; @@ -543,7 +556,7 @@ Things to do: } [eqItem setSubmenu:eqMenu]; - [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex] - 1] setState:NSOnState]; + [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex] + 1] setState:NSOnState]; } - (void)clearHotKeys @@ -594,9 +607,9 @@ Things to do: - (void)timerUpdate { int playlist = [currentRemote currentPlaylistIndex]; - ITMTRemotePlayerState playerState = [currentRemote playerState]; + ITMTRemotePlayerPlayingState playerPlayingState = [currentRemote playerPlayingState]; - if ((playlist > 0) || playerState != stopped) { + if ((playlist > 0) || playerPlayingState != ITMTRemotePlayerStopped) { int trackPlayingIndex = [currentRemote currentSongIndex]; if (trackPlayingIndex != lastSongIndex) { @@ -655,7 +668,7 @@ Things to do: } //Update Play/Pause menu item if (playPauseMenuItem){ - if (playerState == playing) { + if (playerPlayingState == ITMTRemotePlayerPlaying) { [playPauseMenuItem setTitle:@"Pause"]; } else { [playPauseMenuItem setTitle:@"Play"]; @@ -693,6 +706,9 @@ Things to do: [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]; @@ -701,19 +717,33 @@ Things to do: - (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)runTimerInNewThread +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSRunLoop *runLoop = [NSRunLoop currentRunLoop]; + refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:0.2 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES] retain]; + [runLoop run]; + [pool release]; +} + - (void)remotePlayerTerminated:(NSNotification *)note { - isAppRunning = NO; + isAppRunning = ITMTRemotePlayerNotRunning; [menu release]; menu = [[NSMenu alloc] initWithTitle:@""]; @@ -725,6 +755,7 @@ Things to do: [statusItem setMenu:menu]; [refreshTimer invalidate]; + [refreshTimer release]; refreshTimer = nil; [self clearHotKeys]; } @@ -762,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 { - ITMTRemotePlayerState 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 { @@ -794,7 +825,7 @@ Things to do: - (void)fastForward:(id)sender { - [currentRemote fastForward]; + [currentRemote forward]; [playPauseMenuItem setTitle:@"Play"]; } @@ -804,9 +835,16 @@ Things to do: [playPauseMenuItem setTitle:@"Play"]; } -- (void)setSongRating:(id)sender +- (void)toggleEqualizer +{ + [currentRemote setEqualizerEnabled:![currentRemote equalizerEnabled]]; +} + +- (IBAction)setSongRating:(id)sender { - //[currentRemote setCurrentSongRating:[sender tag]]; + NSLog(@"%f", [currentRemote currentSongRating]); + NSLog(@"%f", (float)[sender tag] / 100.0); + [currentRemote setCurrentSongRating:(float)[sender tag] / 100.0]; } // @@ -829,7 +867,7 @@ Things to do: - (void)closePreferences { - if (isAppRunning) { + if ( ( isAppRunning == ITMTRemotePlayerRunning) ) { [self setupHotKeys]; } [prefsController release]; @@ -1126,6 +1164,7 @@ Things to do: { if (refreshTimer) { [refreshTimer invalidate]; + [refreshTimer release]; refreshTimer = nil; } [currentRemote halt];