git.ithinksw.org
/
MenuTunes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I've done some work to the effect of moving MT to use the new HotKey
[MenuTunes.git]
/
MenuController.m
diff --git
a/MenuController.m
b/MenuController.m
index
2ac4826
..
7c0f307
100755
(executable)
--- a/
MenuController.m
+++ b/
MenuController.m
@@
-7,9
+7,9
@@
//
#import "MenuController.h"
//
#import "MenuController.h"
-#import "
New
MainController.h"
-#import
"HotKeyCenter.h"
-#import
"KeyCombo.h"
+#import "MainController.h"
+#import
<ITKit/ITHotKeyCenter.h>
+#import
<ITKit/ITKeyCombo.h>
@interface MenuController (SubmenuMethods)
- (NSMenu *)ratingMenu;
@interface MenuController (SubmenuMethods)
- (NSMenu *)ratingMenu;
@@
-39,7
+39,7
@@
NSString *nextObject;
NSMenuItem *tempItem;
NSEnumerator *itemEnum;
NSString *nextObject;
NSMenuItem *tempItem;
NSEnumerator *itemEnum;
- KeyCombo *keyCombo;
+
IT
KeyCombo *keyCombo;
//Get the information
_currentPlaylist = [currentRemote currentPlaylistIndex];
//Get the information
_currentPlaylist = [currentRemote currentPlaylistIndex];
@@
-72,11
+72,11
@@
[tempItem setTag:MTMenuPlayPauseItem];
[tempItem setTarget:self];
[tempItem setTag:MTMenuPlayPauseItem];
[tempItem setTarget:self];
-
if ( (keyCombo = [[
HotKeyCenter sharedCenter] keyComboForName:@"PlayPause"]) ) {
+
/*if ( (keyCombo = [[IT
HotKeyCenter sharedCenter] keyComboForName:@"PlayPause"]) ) {
[self setKeyEquivalentForCode:[keyCombo keyCode]
andModifiers:[keyCombo modifiers]
onItem:tempItem];
[self setKeyEquivalentForCode:[keyCombo keyCode]
andModifiers:[keyCombo modifiers]
onItem:tempItem];
- }
+ }
*/ // FIX ME!
switch ([currentRemote playerPlayingState]) {
case ITMTRemotePlayerPlaying:
switch ([currentRemote playerPlayingState]) {
case ITMTRemotePlayerPlaying:
@@
-94,11
+94,11
@@
action:@selector(performMainMenuAction:)
keyEquivalent:@""];
action:@selector(performMainMenuAction:)
keyEquivalent:@""];
-
if ( (keyCombo = [[
HotKeyCenter sharedCenter] keyComboForName:@"NextTrack"]) ) {
+
/*if ( (keyCombo = [[IT
HotKeyCenter sharedCenter] keyComboForName:@"NextTrack"]) ) {
[self setKeyEquivalentForCode:[keyCombo keyCode]
andModifiers:[keyCombo modifiers]
onItem:tempItem];
[self setKeyEquivalentForCode:[keyCombo keyCode]
andModifiers:[keyCombo modifiers]
onItem:tempItem];
- }
+ }
*/ // FIX ME!
if (_currentPlaylist) {
[tempItem setTag:MTMenuNextTrackItem];
if (_currentPlaylist) {
[tempItem setTag:MTMenuNextTrackItem];
@@
-109,11
+109,11
@@
action:@selector(performMainMenuAction:)
keyEquivalent:@""];
action:@selector(performMainMenuAction:)
keyEquivalent:@""];
-
if ( (keyCombo = [[
HotKeyCenter sharedCenter] keyComboForName:@"PrevTrack"]) ) {
+
/*if ( (keyCombo = [[IT
HotKeyCenter sharedCenter] keyComboForName:@"PrevTrack"]) ) {
[self setKeyEquivalentForCode:[keyCombo keyCode]
andModifiers:[keyCombo modifiers]
onItem:tempItem];
[self setKeyEquivalentForCode:[keyCombo keyCode]
andModifiers:[keyCombo modifiers]
onItem:tempItem];
- }
+ }
*/ // FIX ME!
if (_currentPlaylist) {
[tempItem setTag:MTMenuPreviousTrackItem];
if (_currentPlaylist) {
[tempItem setTag:MTMenuPreviousTrackItem];
@@
-142,11
+142,11
@@
action:@selector(performMainMenuAction:)
keyEquivalent:@""];
action:@selector(performMainMenuAction:)
keyEquivalent:@""];
-
if ( (keyCombo = [[
HotKeyCenter sharedCenter] keyComboForName:@"ShowPlayer"]) ) {
+
/*if ( (keyCombo = [[IT
HotKeyCenter sharedCenter] keyComboForName:@"ShowPlayer"]) ) {
[self setKeyEquivalentForCode:[keyCombo keyCode]
andModifiers:[keyCombo modifiers]
onItem:tempItem];
[self setKeyEquivalentForCode:[keyCombo keyCode]
andModifiers:[keyCombo modifiers]
onItem:tempItem];
- }
+ }
*/ // FIX ME!
[tempItem setTarget:self];
[tempItem setTag:MTMenuShowPlayerItem];
[tempItem setTarget:self];
[tempItem setTag:MTMenuShowPlayerItem];