[[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];
-
[NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
- [self rebuildMenu];
[self setupHotKeys];
+ [self rebuildMenu];
isAppRunning = ITMTRemotePlayerRunning;
- return;
}
-
- isAppRunning = ITMTRemotePlayerRunning;
}
- (void)applicationTerminated:(NSNotification *)note
lastSongIdentifier = [[currentRemote currentSongUniqueIdentifier] retain];
//If we're in a playlist or radio mode
- if ( (trackInfoIndex > -1) && (playlist || isPlayingRadio) ) {
+ if ( ![lastSongIdentifier isEqualToString:@"0-0"] && (trackInfoIndex > -1) ) {
NSString *title;
- if ( (i = [menu indexOfItemWithTitle:@"No Song"]) && (i > -1) ) {
- [menu removeItemAtIndex:i];
- [menu insertItemWithTitle:@"Now Playing" action:NULL keyEquivalent:@"" atIndex:i];
+ if ( (i = [menu indexOfItemWithTitle:@"No Song"]) ) {
+ if ( (i > -1) ) {
+ [menu removeItemAtIndex:i];
+ [menu insertItemWithTitle:@"Now Playing" action:NULL keyEquivalent:@"" atIndex:i];
+ }
}
title = [currentRemote currentSongTitle];
}
if ([defaults boolForKey:@"showTrackRating"]) {
+ if (title) { //Check to see if there's a song playing
[menu insertItemWithTitle:[NSString stringWithFormat:@" %@", [[ratingMenu itemAtIndex:[currentRemote currentSongRating] * 5] title]] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+ }
}
if ([defaults boolForKey:@"showArtist"]) {
}
}
+ if ([defaults boolForKey:@"showTrackNumber"]) {
+ int track = [currentRemote currentSongTrack];
+ int total = [currentRemote currentAlbumTrackCount];
+ if (total > 0) {
+ [menu insertItemWithTitle:[NSString stringWithFormat:@" Track %i of %i", track, total] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+ }
+ }
+
if ([defaults boolForKey:@"showAlbum"]) {
NSString *album = [currentRemote currentSongAlbum];
if ([album length] > 0) {
- (void)rebuildEQPresetsMenu
{
NSArray *eqPresets = [currentRemote eqPresets];
- NSMenuItem *enabledItem;
int i;
- [eqMenu release];
+ [eqMenu autorelease];
eqMenu = [[NSMenu alloc] initWithTitle:@""];
- enabledItem = [eqMenu addItemWithTitle:@"Enabled"
- action:@selector(selectEQPreset:)
- keyEquivalent:@""];
- [enabledItem setTag:-1];
-
- if ([currentRemote equalizerEnabled]) {
- [enabledItem setState:NSOnState];
- }
-
- [eqMenu addItem:[NSMenuItem separatorItem]];
-
for (i = 0; i < [eqPresets count]; i++) {
- NSString *name = [eqPresets objectAtIndex:i];
+ NSString *name;
NSMenuItem *tempItem;
- if (name) {
+ if ( ( name = [eqPresets objectAtIndex:i] ) ) {
tempItem = [[NSMenuItem alloc] initWithTitle:name action:@selector(selectEQPreset:) keyEquivalent:@""];
[tempItem setTag:i];
[eqMenu addItem:tempItem];
- [tempItem release];
+ [tempItem autorelease];
}
}
+
[eqItem setSubmenu:eqMenu];
[eqItem setEnabled:YES];
-
- [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex] + 1] setState:NSOnState];
+ [[eqMenu itemAtIndex:([currentRemote currentEQPresetIndex] - 1)] setState:NSOnState];
}
- (void)updateRatingMenu
NSString *currentIdentifier = [currentRemote currentSongUniqueIdentifier];
if (![lastSongIdentifier isEqualToString:currentIdentifier] ||
(!isPlayingRadio && ([currentRemote classOfPlaylistAtIndex:[currentRemote currentPlaylistIndex]] == ITMTRemotePlayerRadioPlaylist))) {
+ //
+ //
+ // If we want to show the new track floater, do it here!
+ //
+ //
[self rebuildMenu];
}
//Update Play/Pause menu item
if (playPauseItem){
+ //
+ //
+ // If we want to show the song played/paused, show it here!
+ //
+ //
if ([currentRemote playerPlayingState] == ITMTRemotePlayerPlaying) {
[playPauseItem setTitle:@"Pause"];
} else {
int curSet = [currentRemote currentEQPresetIndex];
int item = [sender tag];
- if (item == -1) {
- [currentRemote setEqualizerEnabled:![currentRemote equalizerEnabled]];
- } else {
- [currentRemote setEqualizerEnabled:YES];
- [currentRemote switchToEQAtIndex:item];
- [[eqMenu itemAtIndex:curSet + 1] setState:NSOffState];
- [[eqMenu itemAtIndex:item + 2] setState:NSOnState];
- }
+ [currentRemote switchToEQAtIndex:item];
+ [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState];
+ [[eqMenu itemAtIndex:item] setState:NSOnState];
}
- (void)selectSongRating:(id)sender
[[HotKeyCenter sharedCenter] removeHotKey:@"PrevTrack"];
[[HotKeyCenter sharedCenter] removeHotKey:@"TrackInfo"];
[[HotKeyCenter sharedCenter] removeHotKey:@"UpcomingSongs"];
+ [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleLoop"];
+ [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleShuffle"];
+ [[HotKeyCenter sharedCenter] removeHotKey:@"IncrementVolume"];
+ [[HotKeyCenter sharedCenter] removeHotKey:@"DecrementVolume"];
+ [[HotKeyCenter sharedCenter] removeHotKey:@"IncrementRating"];
+ [[HotKeyCenter sharedCenter] removeHotKey:@"DecrementRating"];
}
- (void)setupHotKeys
combo:[defaults keyComboForKey:@"UpcomingSongs"]
target:self action:@selector(showUpcomingSongs)];
}
+
+ if ([defaults objectForKey:@"ToggleLoop"] != nil) {
+ [[HotKeyCenter sharedCenter] addHotKey:@"ToggleLoop"
+ combo:[defaults keyComboForKey:@"ToggleLoop"]
+ target:self action:NULL/*Set this to something*/];
+ }
+
+ if ([defaults objectForKey:@"ToggleShuffle"] != nil) {
+ [[HotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle"
+ combo:[defaults keyComboForKey:@"ToggleShuffle"]
+ target:self action:NULL/*Set this to something*/];
+ }
+
+ if ([defaults objectForKey:@"IncrementVolume"] != nil) {
+ [[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume"
+ combo:[defaults keyComboForKey:@"IncrementVolume"]
+ target:self action:NULL/*Set this to something*/];
+ }
+
+ if ([defaults objectForKey:@"DecrementVolume"] != nil) {
+ [[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume"
+ combo:[defaults keyComboForKey:@"DecrementVolume"]
+ target:self action:NULL/*Set this to something*/];
+ }
+
+ if ([defaults objectForKey:@"IncrementRating"] != nil) {
+ [[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating"
+ combo:[defaults keyComboForKey:@"IncrementRating"]
+ target:self action:NULL/*Set this to something*/];
+ }
+
+ if ([defaults objectForKey:@"DecrementRating"] != nil) {
+ [[HotKeyCenter sharedCenter] addHotKey:@"DecrementRating"
+ combo:[defaults keyComboForKey:@"DecrementRating"]
+ target:self action:NULL/*Set this to something*/];
+ }
}
//
//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';*/
+
}
break;
git.ithinksw.org / MenuTunes.git / blobdiff