//
#import "MenuController.h"
-#import "NewMainController.h"
-#import "HotKeyCenter.h"
-#import "KeyCombo.h"
+#import "MainController.h"
+#import <ITKit/ITHotKeyCenter.h>
+#import <ITKit/ITHotKey.h>
+#import <ITKit/ITKeyCombo.h>
@interface MenuController (SubmenuMethods)
- (NSMenu *)ratingMenu;
NSString *nextObject;
NSMenuItem *tempItem;
NSEnumerator *itemEnum;
- KeyCombo *keyCombo;
+ ITHotKey *hotKey;
+ NSArray *hotKeys = [[ITHotKeyCenter sharedCenter] allHotKeys];
//Get the information
_currentPlaylist = [currentRemote currentPlaylistIndex];
[tempItem setTag:MTMenuPlayPauseItem];
[tempItem setTarget:self];
- if ( (keyCombo = [[HotKeyCenter sharedCenter] keyComboForName:@"PlayPause"]) ) {
- [self setKeyEquivalentForCode:[keyCombo keyCode]
- andModifiers:[keyCombo modifiers]
- onItem:tempItem];
+ itemEnum = [hotKeys objectEnumerator];
+ while ( (hotKey = [itemEnum nextObject]) ) {
+ if ([[hotKey name] isEqualToString:@"PlayPause"]) {
+ ITKeyCombo *combo = [hotKey keyCombo];
+ [self setKeyEquivalentForCode:[combo keyCode]
+ andModifiers:[combo modifiers]
+ onItem:tempItem];
+ }
}
switch ([currentRemote playerPlayingState]) {
action:@selector(performMainMenuAction:)
keyEquivalent:@""];
- if ( (keyCombo = [[HotKeyCenter sharedCenter] keyComboForName:@"NextTrack"]) ) {
- [self setKeyEquivalentForCode:[keyCombo keyCode]
- andModifiers:[keyCombo modifiers]
- onItem:tempItem];
+ itemEnum = [hotKeys objectEnumerator];
+ while ( (hotKey = [itemEnum nextObject]) ) {
+ if ([[hotKey name] isEqualToString:@"NextTrack"]) {
+ ITKeyCombo *combo = [hotKey keyCombo];
+ [self setKeyEquivalentForCode:[combo keyCode]
+ andModifiers:[combo modifiers]
+ onItem:tempItem];
+ }
}
if (_currentPlaylist) {
action:@selector(performMainMenuAction:)
keyEquivalent:@""];
- if ( (keyCombo = [[HotKeyCenter sharedCenter] keyComboForName:@"PrevTrack"]) ) {
- [self setKeyEquivalentForCode:[keyCombo keyCode]
- andModifiers:[keyCombo modifiers]
- onItem:tempItem];
+ itemEnum = [hotKeys objectEnumerator];
+ while ( (hotKey = [itemEnum nextObject]) ) {
+ if ([[hotKey name] isEqualToString:@"PrevTrack"]) {
+ ITKeyCombo *combo = [hotKey keyCombo];
+ [self setKeyEquivalentForCode:[combo keyCode]
+ andModifiers:[combo modifiers]
+ onItem:tempItem];
+ }
}
if (_currentPlaylist) {
action:@selector(performMainMenuAction:)
keyEquivalent:@""];
- if ( (keyCombo = [[HotKeyCenter sharedCenter] keyComboForName:@"ShowPlayer"]) ) {
- [self setKeyEquivalentForCode:[keyCombo keyCode]
- andModifiers:[keyCombo modifiers]
- onItem:tempItem];
+ itemEnum = [hotKeys objectEnumerator];
+ while ( (hotKey = [itemEnum nextObject]) ) {
+ if ([[hotKey name] isEqualToString:@"ShowPlayer"]) {
+ ITKeyCombo *combo = [hotKey keyCombo];
+ [self setKeyEquivalentForCode:[combo keyCode]
+ andModifiers:[combo modifiers]
+ onItem:tempItem];
+ }
}
[tempItem setTarget:self];
}
if ([defaults boolForKey:@"showAlbum"]) {
- [menu addItemWithTitle:[NSString stringWithFormat:@" %@", [currentRemote currentSongAlbum]]
- action:nil
- keyEquivalent:@""];
+ NSString *curAlbum = [currentRemote currentSongAlbum];
+ if ([curAlbum length]) {
+ [menu addItemWithTitle:[NSString stringWithFormat:@" %@", curAlbum]
+ action:nil
+ keyEquivalent:@""];
+ }
}
if ([defaults boolForKey:@"showArtist"]) {
- [menu addItemWithTitle:[NSString stringWithFormat:@" %@", [currentRemote currentSongArtist]]
- action:nil
- keyEquivalent:@""];
+ NSString *curArtist = [currentRemote currentSongArtist];
+ if ([curArtist length]) {
+ [menu addItemWithTitle:[NSString stringWithFormat:@" %@", curArtist]
+ action:nil
+ keyEquivalent:@""];
+ }
}
if ([defaults boolForKey:@"showTrackNumber"]) {