-/*
-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"
menu = [[NSMenu alloc] initWithTitle:@""];
- if ([currentRemote isAppRunning]) {
+ if ( ( [currentRemote playerRunningStatus] == 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"]];
playPauseMenuItem = nil;
upcomingSongsItem = nil;
+ songRatingMenuItem = nil;
playlistItem = nil;
[playlistMenu release];
playlistMenu = nil;
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:@"<separator>"]) {
[menu addItem:[NSMenuItem separatorItem]];
}
NSMenuItem *menuItem;
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- if (!isAppRunning) {
+ if ( ( isAppRunning == ITMTRemotePlayerNotRunning ) ) {
return;
}
if (eqItem) {
[self rebuildEQPresetsMenu];
}
-
if (trackInfoIndex > -1) {
NSString *curSongName, *curAlbumName = @"", *curArtistName = @"";
curSongName = [currentRemote currentSongTitle];
[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"]) {
[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];
[eqMenu release];
eqMenu = [[NSMenu alloc] initWithTitle:@""];
- enabledItem = [eqMenu addItemWithTitle:@"EQ Enabled"
- action:NULL
+ 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++) {
}
[eqItem setSubmenu:eqMenu];
- [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex] - 1] setState:NSOnState];
+ [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex] + 1] setState:NSOnState];
}
- (void)clearHotKeys
int playlist = [currentRemote currentPlaylistIndex];
ITMTRemotePlayerState playerState = [currentRemote playerState];
- if ((playlist > 0) || playerState != stopped) {
+ if ((playlist > 0) || playerState != ITMTRemotePlayerStopped) {
int trackPlayingIndex = [currentRemote currentSongIndex];
if (trackPlayingIndex != lastSongIndex) {
}
//Update Play/Pause menu item
if (playPauseMenuItem){
- if (playerState == playing) {
+ if (playerState == ITMTRemotePlayerPlaying) {
[playPauseMenuItem setTitle:@"Pause"];
} else {
[playPauseMenuItem setTitle:@"Play"];
[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)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:@""];
[statusItem setMenu:menu];
[refreshTimer invalidate];
+ [refreshTimer release];
refreshTimer = nil;
[self clearHotKeys];
}
{
ITMTRemotePlayerState state = [currentRemote playerState];
- 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 {
- (void)fastForward:(id)sender
{
- [currentRemote fastForward];
+ [currentRemote forward];
[playPauseMenuItem setTitle:@"Play"];
}
[playPauseMenuItem setTitle:@"Play"];
}
-- (void)setSongRating:(id)sender
+- (void)toggleEqualizer
+{
+ [currentRemote setEqualizerEnabled:![currentRemote equalizerEnabled]];
+}
+
+- (IBAction)setSongRating:(id)sender
{
+ NSLog(@"%f", [currentRemote currentSongRating]);
NSLog(@"%f", (float)[sender tag] / 100.0);
[currentRemote setCurrentSongRating:(float)[sender tag] / 100.0];
}
- (void)closePreferences
{
- if (isAppRunning) {
+ if ( ( isAppRunning == ITMTRemotePlayerRunning) ) {
[self setupHotKeys];
}
[prefsController release];
{
if (refreshTimer) {
[refreshTimer invalidate];
+ [refreshTimer release];
refreshTimer = nil;
}
[currentRemote halt];
git.ithinksw.org / MenuTunes.git / blobdiff