Added fast forward and rewind hotkeys.
Added enabled item to EQ menu.
Fixed the prefs delay bug.
Added a popup menu hotkey.
passwordPanelTextField = NSTextField;
passwordPanelTitle = NSTextField;
passwordTextField = NSTextField;
+ playCountCheckbox = NSButton;
positionMatrix = NSMatrix;
ratingCheckbox = NSButton;
runScriptsCheckbox = NSButton;
<string>386 450 380 122 0 0 1152 746 </string>
</dict>
<key>IBFramework Version</key>
- <string>349.0</string>
+ <string>364.0</string>
<key>IBLockedObjects</key>
<array>
<integer>281</integer>
<integer>6</integer>
</array>
<key>IBSystem Version</key>
- <string>7D24</string>
+ <string>7H63</string>
</dict>
</plist>
*/
- (NSImage *)currentSongAlbumArt;
+/*!
+ * @method currentSongPlayCount
+ */
+- (int)currentSongPlayCount;
+
/*!
* @method currentSongRating
*/
*/
- (BOOL)setCurrentSongRating:(float)rating;
+/*!
+ * @method equalizerEnabled
+ */
+- (BOOL)equalizerEnabled;
+
+/*!
+ * @method setEqualizerEnabled:
+ */
+- (BOOL)setEqualizerEnabled:(BOOL)enabled;
+
/*!
* @method eqPresets
*/
return nil;
}
+- (int)currentSongPlayCount
+{
+ return nil;
+}
+
- (float)currentSongRating
{
return nil;
return NO;
}
-/* - (BOOL)equalizerEnabled
+- (BOOL)equalizerEnabled
{
return NO;
}
- (BOOL)setEqualizerEnabled:(BOOL)enabled
{
return NO;
-} */
+}
- (NSArray *)eqPresets
{
#import "StatusWindowController.h"
#import "StatusItemHack.h"
+@interface NSCarbonMenuImpl:NSObject
+{
+ NSMenu *_menu;
+}
+
++ (void)initialize;
++ (void)setupForNoMenuBar;
+- (void)dealloc;
+- (void)setMenu:fp8;
+- menu;
+- (void)itemChanged:fp8;
+- (void)itemAdded:fp8;
+- (void)itemRemoved:fp8;
+- (void)performActionWithHighlightingForItemAtIndex:(int)fp8;
+- (void)performMenuAction:(SEL)fp8 withTarget:fp12;
+- (void)setupCarbonMenuBar;
+- (void)setAsMainCarbonMenuBar;
+- (void)clearAsMainCarbonMenuBar;
+- (void)popUpMenu:fp8 atLocation:(NSPoint)fp12 width:(float)fp20 forView:fp24 withSelectedItem:(int)fp28 withFont:fp32;
+- (void)_popUpContextMenu:fp8 withEvent:fp12 forView:fp16 withFont:fp20;
+- (void)_popUpContextMenu:fp8 withEvent:fp12 forView:fp16;
+- window;
+@end
+
@implementation NSImage (SmoothAdditions)
- (NSImage *)imageScaledSmoothlyToSize:(NSSize)scaledSize
{
ITDebugLog(@"Selecting EQ preset %i", index);
NS_DURING
- [[self currentRemote] switchToEQAtIndex:index];
+ if (index == -1) {
+ [[self currentRemote] setEqualizerEnabled:![[self currentRemote] equalizerEnabled]];
+ } else {
+ [[self currentRemote] switchToEQAtIndex:index];
+ }
NS_HANDLER
[self networkError:localException];
NS_ENDHANDLER
[[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
}
+ if ([df objectForKey:@"FastForward"] != nil) {
+ ITDebugLog(@"Setting up fast forward hot key.");
+ hotKey = [[ITHotKey alloc] init];
+ [hotKey setName:@"FastForward"];
+ [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"FastForward"]]];
+ [hotKey setTarget:self];
+ [hotKey setAction:@selector(fastForward)];
+ [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+ }
+
+ if ([df objectForKey:@"Rewind"] != nil) {
+ ITDebugLog(@"Setting up rewind hot key.");
+ hotKey = [[ITHotKey alloc] init];
+ [hotKey setName:@"Rewind"];
+ [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"Rewind"]]];
+ [hotKey setTarget:self];
+ [hotKey setAction:@selector(rewind)];
+ [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+ }
+
if ([df objectForKey:@"ShowPlayer"] != nil) {
ITDebugLog(@"Setting up show player hot key.");
hotKey = [[ITHotKey alloc] init];
[hotKey setAction:@selector(decrementRating)];
[[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
}
+
+ if ([df objectForKey:@"PopupMenu"] != nil) {
+ ITDebugLog(@"Setting up popup menu hot key.");
+ hotKey = [[ITHotKey alloc] init];
+ [hotKey setName:@"PopupMenu"];
+ [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PopupMenu"]]];
+ [hotKey setTarget:self];
+ [hotKey setAction:@selector(popupMenu)];
+ [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+ }
ITDebugLog(@"Finished setting up hot keys.");
}
NSString *track = nil;
NSImage *art = nil;
int rating = -1;
+ int playCount = -1;
ITDebugLog(@"Showing track info status window.");
rating = ( currentRating * 5 );
}
}
+
+ if ( [df boolForKey:@"showPlayCount"] ) {
+ NS_DURING
+ playCount = [[self currentRemote] currentSongPlayCount];
+ NS_HANDLER
+ [self networkError:localException];
+ NS_ENDHANDLER
+ }
} else {
title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
}
time:time
track:track
rating:rating
+ playCount:playCount
image:art];
}
NS_ENDHANDLER
}
+- (void)popupMenu
+{
+ NSMenu *menu = [menuController menu];
+ [(NSCarbonMenuImpl *)[menu _menuImpl] popUpMenu:menu atLocation:[NSEvent mouseLocation] width:1 forView:nil withSelectedItem:-30 withFont:[NSFont menuFontOfSize:32]];
+}
+
- (void)incrementVolume
{
NS_DURING
if (!_playingRadio) {
NS_DURING
+ if ([defaults boolForKey:@"showPlayCount"]) {
+ [menu indentItem:[menu addItemWithTitle:[NSString stringWithFormat:@"Play Count: %i", [mtr currentSongPlayCount]] action:nil keyEquivalent:@""]];
+ }
if ([defaults boolForKey:@"showTrackRating"] && ( [mtr currentSongRating] != -1.0 )) {
NSString *string = nil;
switch ((int)([mtr currentSongRating] * 5)) {
[tempItem setState:NSOffState];
}
NS_DURING
+ [[_eqMenu itemAtIndex:0] setState:[mtr equalizerEnabled] ? NSOnState : NSOffState];
+ [[_eqMenu itemAtIndex:([mtr currentEQPresetIndex] + 1)] setState:NSOnState];
[[_eqMenu itemAtIndex:([mtr currentEQPresetIndex] - 1)] setState:NSOnState];
NS_HANDLER
[[MainController sharedController] networkError:localException];
ITDebugLog(@"Building \"EQ Presets\" menu.");
+ tempItem = [eqMenu addItemWithTitle:@"Enabled" action:@selector(performEqualizerMenuAction:) keyEquivalent:@""];
+ [tempItem setTag:-1];
+ [tempItem setTarget:self];
+ NS_DURING
+ [tempItem setState:[[[MainController sharedController] currentRemote] equalizerEnabled] ? NSOnState : NSOffState];
+ NS_HANDLER
+ [[MainController sharedController] networkError:localException];
+ NS_ENDHANDLER
+ [eqMenu addItem:[NSMenuItem separatorItem]];
+
for (i = 0; i < [eqPresets count]; i++) {
NSString *name;
if ( ( name = [eqPresets objectAtIndex:i] ) ) {
IBOutlet NSTextField *passwordPanelTextField;
IBOutlet NSTextField *passwordPanelTitle;
IBOutlet NSTextField *passwordTextField;
+ IBOutlet NSButton *playCountCheckbox;
IBOutlet NSMatrix *positionMatrix;
IBOutlet NSButton *ratingCheckbox;
IBOutlet NSButton *runScriptsCheckbox;
hotKeysArray = [[NSArray alloc] initWithObjects:@"PlayPause",
@"NextTrack",
@"PrevTrack",
+ @"FastForward",
+ @"Rewind",
@"ShowPlayer",
@"TrackInfo",
@"UpcomingSongs",
@"DecrementRating",
@"ToggleShuffle",
@"ToggleLoop",
+ @"PopupMenu",
nil];
hotKeyNamesArray = [[NSArray alloc] initWithObjects:@"Play/Pause",
@"Next Track",
@"Previous Track",
+ @"Fast Forward",
+ @"Rewind",
@"Show Player",
@"Track Info",
@"Upcoming Songs",
@"Decrement Rating",
@"Toggle Shuffle",
@"Toggle Loop",
+ @"Pop-up status menu",
nil];
hotKeysDictionary = [[NSMutableDictionary alloc] init];
controller = nil;
} else if ( [sender tag] == 1030) {
[df setInteger:[sender intValue] forKey:@"SongsInAdvance"];
if ([[controller currentRemote] playerRunningState] == ITMTRemotePlayerRunning) {
- [[controller menuController] rebuildSubmenus];
+ [[controller menuController] performSelector:@selector(rebuildSubmenus) withObject:nil afterDelay:0];
}
} else if ( [sender tag] == 1040) {
// This will not be executed. Song info always shows the title of the song.
[df setBool:SENDER_STATE forKey:@"showTime"];
} else if ( [sender tag] == 1080) {
[df setBool:SENDER_STATE forKey:@"showTrackNumber"];
+ } else if ( [sender tag] == 1085) {
+ [df setBool:SENDER_STATE forKey:@"showPlayCount"];
} else if ( [sender tag] == 1090) {
[df setBool:SENDER_STATE forKey:@"showTrackRating"];
} else if ( [sender tag] == 1100) {
[composerCheckbox setState:[df boolForKey:@"showComposer"] ? NSOnState : NSOffState];
[trackTimeCheckbox setState:[df boolForKey:@"showTime"] ? NSOnState : NSOffState];
[trackNumberCheckbox setState:[df boolForKey:@"showTrackNumber"] ? NSOnState : NSOffState];
+ [playCountCheckbox setState:[df boolForKey:@"showPlayCount"] ? NSOnState : NSOffState];
[ratingCheckbox setState:[df boolForKey:@"showTrackRating"] ? NSOnState : NSOffState];
[albumArtworkCheckbox setState:[df boolForKey:@"showAlbumArtwork"] ? NSOnState : NSOffState];
time: (NSString *)time // FLOW: Should probably be NSDate or something.
track: (NSString *)track
rating: (int)rating
+ playCount: (int)playCount
image: (NSImage *)art;
time: (NSString *)time // FLOW: Should probably be NSDate or something.
track: (NSString *)track
rating: (int)rating
+ playCount: (int)playCount
image: (NSImage *)art
{
NSImage *image = nil;
if ( track ) {
text = [text stringByAppendingString:[@"\n" stringByAppendingString:track]];
}
+ if (playCount > -1) {
+ text = [text stringByAppendingString:[NSString stringWithFormat:@"\nPlay Count: %i", playCount]];
+ }
if ( rating > -1 ) {
NSString *ratingString = [NSString string];
text = [text stringByAppendingString:[@"\n" stringByAppendingString:ratingString]];
}
-
[_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
[_window buildTextWindowWithString:text];
[_window appear:self];
}
}
+- (int)currentSongPlayCount
+{
+ int count;
+ ITDebugLog(@"Getting current song play count.");
+ count = [[ITAppleEventCenter sharedCenter] sendTwoTierAEWithRequestedKeyForNumber:@"pPlC" fromObjectByKey:@"pTrk" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+ ITDebugLog(@"Getting current song play count done.");
+ return count;
+}
+
- (float)currentSongRating
{
float temp1;
- (BOOL)equalizerEnabled
{
ITDebugLog(@"Getting equalizer enabled status.");
- int thingy = [[ITAppleEventCenter sharedCenter] sendAEWithSendStringForNumber:@"'----':obj { form:type('prop'), want:type('prop'), seld:type('pEQ '), from:() }" eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
+ int thingy = [[ITAppleEventCenter sharedCenter] sendAEWithRequestedKeyForNumber:@"pEQ " eventClass:@"core" eventID:@"getd" appPSN:savedPSN];
ITDebugLog(@"Done getting equalizer enabled status.");
return (thingy != 0) ? YES : NO;
}