git.ithinksw.org
/
MenuTunes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Plugin API changes
[MenuTunes.git]
/
MenuTunes.m
diff --git
a/MenuTunes.m
b/MenuTunes.m
index
54f5768
..
9115c10
100755
(executable)
--- 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"
#import "MenuTunes.h"
#import "PreferencesController.h"
#import "HotKeyCenter.h"
@@
-53,7
+44,7
@@
Things to do:
menu = [[NSMenu alloc] initWithTitle:@""];
menu = [[NSMenu alloc] initWithTitle:@""];
- if (
[currentRemote isAppRunning]
) {
+ if (
( [currentRemote remotePlayerStatus] == ITMTRemotePlayerRunning )
) {
[self remotePlayerLaunched:nil];
} else {
[self remotePlayerTerminated:nil];
[self remotePlayerLaunched:nil];
} else {
[self remotePlayerTerminated:nil];
@@
-331,7
+322,7
@@
Things to do:
NSMenuItem *menuItem;
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSMenuItem *menuItem;
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- if (
!isAppRunning
) {
+ if (
( isAppRunning = ITMTRemotePlayerNotRunning )
) {
return;
}
return;
}
@@
-522,6
+513,7
@@
Things to do:
- (void)rebuildEQPresetsMenu
{
NSArray *eqPresets = [currentRemote eqPresets];
- (void)rebuildEQPresetsMenu
{
NSArray *eqPresets = [currentRemote eqPresets];
+ NSMenuItem *enabledItem;
int i;
if (eqMenu && ([[currentRemote eqPresets] count] == [eqMenu numberOfItems]))
int i;
if (eqMenu && ([[currentRemote eqPresets] count] == [eqMenu numberOfItems]))
@@
-530,6
+522,11
@@
Things to do:
[eqMenu release];
eqMenu = [[NSMenu alloc] initWithTitle:@""];
[eqMenu release];
eqMenu = [[NSMenu alloc] initWithTitle:@""];
+ enabledItem = [eqMenu addItemWithTitle:@"EQ Enabled"
+ action:NULL
+ keyEquivalent:@""];
+ [eqMenu addItem:[NSMenuItem separatorItem]];
+
for (i = 0; i < [eqPresets count]; i++) {
NSString *setName = [eqPresets objectAtIndex:i];
NSMenuItem *tempItem;
for (i = 0; i < [eqPresets count]; i++) {
NSString *setName = [eqPresets objectAtIndex:i];
NSMenuItem *tempItem;
@@
-543,7
+540,7
@@
Things to do:
}
[eqItem setSubmenu:eqMenu];
}
[eqItem setSubmenu:eqMenu];
- [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex]
-
1] setState:NSOnState];
+ [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex]
+
1] setState:NSOnState];
}
- (void)clearHotKeys
}
- (void)clearHotKeys
@@
-701,19
+698,24
@@
Things to do:
- (void)remotePlayerLaunched:(NSNotification *)note
{
- (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];
[self rebuildMenu]; //Rebuild the menu since no songs will be playing
//Restart the timer
refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
[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)remotePlayerTerminated:(NSNotification *)note
{
[statusItem setMenu:menu]; //Set the menu back to the main one
}
- (void)remotePlayerTerminated:(NSNotification *)note
{
- isAppRunning =
NO
;
+ isAppRunning =
ITMTRemotePlayerNotRunning
;
[menu release];
menu = [[NSMenu alloc] initWithTitle:@""];
[menu release];
menu = [[NSMenu alloc] initWithTitle:@""];
@@
-806,7
+808,8
@@
Things to do:
- (void)setSongRating:(id)sender
{
- (void)setSongRating:(id)sender
{
- //[currentRemote setCurrentSongRating:[sender tag]];
+ NSLog(@"%f", (float)[sender tag] / 100.0);
+ [currentRemote setCurrentSongRating:(float)[sender tag] / 100.0];
}
//
}
//
@@
-829,7
+832,7
@@
Things to do:
- (void)closePreferences
{
- (void)closePreferences
{
- if (
isAppRunning
) {
+ if (
( isAppRunning == ITMTRemotePlayerRunning)
) {
[self setupHotKeys];
}
[prefsController release];
[self setupHotKeys];
}
[prefsController release];