- (void)rebuildUpcomingSongsMenu;
- (void)rebuildPlaylistMenu;
- (void)rebuildEQPresetsMenu;
+- (void)updateRatingMenu;
- (void)setupHotKeys;
- (void)timerUpdate;
-- (void)updateMenu;
- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
onItem:(NSMenuItem *)item;
- (void)applicationDidFinishLaunching:(NSNotification *)note
{
+ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
currentRemote = [self loadRemote];
- [currentRemote begin];
//Setup for notification of the remote player launching or quitting
[[[NSWorkspace sharedWorkspace] notificationCenter]
selector:@selector(applicationLaunched:)
name:NSWorkspaceDidLaunchApplicationNotification
object:nil];
-
- [self registerDefaults];
+
+ if ( ! [defaults objectForKey:@"menu"] ) { // If this is nil, defaults have never been registered.
+ [[PreferencesController sharedPrefs] registerDefaults];
+ }
statusItem = [[ITStatusItem alloc]
initWithStatusBar:[NSStatusBar systemStatusBar]
- (void)applicationLaunched:(NSNotification *)note
{
if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
+ [currentRemote begin];
+ [self timerUpdate];
[NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
-
- [self rebuildMenu];
- [statusItem setMenu:menu];
[self setupHotKeys];
isAppRunning = ITMTRemotePlayerRunning;
- return;
}
-
- isAppRunning = ITMTRemotePlayerRunning;
}
- (void)applicationTerminated:(NSNotification *)note
{
- if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
+ if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
NSMenu *notRunningMenu = [[NSMenu alloc] initWithTitle:@""];
- [[notRunningMenu addItemWithTitle:[NSString stringWithFormat:@"Open %@", [currentRemote playerSimpleName]] action:@selector(showPlayer:) keyEquivalent:@""] setTarget:self];
+ [notRunningMenu addItemWithTitle:[NSString stringWithFormat:@"Open %@", [currentRemote playerSimpleName]] action:@selector(showPlayer:) keyEquivalent:@""];
[notRunningMenu addItem:[NSMenuItem separatorItem]];
- [[notRunningMenu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
- [[notRunningMenu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
+ [notRunningMenu addItemWithTitle:@"Preferences..." action:@selector(showPreferences:) keyEquivalent:@""];
+ [[notRunningMenu addItemWithTitle:@"Quit" action:@selector(terminate:) keyEquivalent:@""] setTarget:NSApp];
[statusItem setMenu:[notRunningMenu autorelease]];
+ [currentRemote halt];
[refreshTimer invalidate];
[refreshTimer release];
refreshTimer = nil;
[self clearHotKeys];
- isAppRunning = NO;
- return;
+ isAppRunning = ITMTRemotePlayerNotRunning;
}
}
#pragma mark INSTANCE METHODS
/*************************************************************************/
-- (void)registerDefaults
-{
- NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- if (![defaults objectForKey:@"menu"]) {
- BOOL found = NO;
- NSMutableDictionary *loginwindow;
- NSMutableArray *loginarray;
- int i;
-
- [defaults setObject:
- [NSArray arrayWithObjects:
- @"Play/Pause",
- @"Next Track",
- @"Previous Track",
- @"Fast Forward",
- @"Rewind",
- @"<separator>",
- @"Upcoming Songs",
- @"Playlists",
- @"Song Rating",
- @"<separator>",
- @"PreferencesÉ",
- @"Quit",
- @"<separator>",
- @"Current Track Info",
- nil] forKey:@"menu"];
-
- [defaults synchronize];
- loginwindow = [[defaults persistentDomainForName:@"loginwindow"] mutableCopy];
- loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
-
- for (i = 0; i < [loginarray count]; i++) {
- NSDictionary *tempDict = [loginarray objectAtIndex:i];
- if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:
- [[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
- found = YES;
- }
- }
-
- //
- //This is teh sux
- //We must fix it so it is no longer suxy
- if (!found) {
- if (NSRunInformationalAlertPanel(@"Auto-launch MenuTunes", @"Would you like MenuTunes to automatically launch at login?", @"Yes", @"No", nil) == NSOKButton) {
- AEDesc scriptDesc, resultDesc;
- NSString *script = [NSString stringWithFormat:@"tell application \"System Events\"\nmake new login item at end of login items with properties {path:\"%@\", kind:\"APPLICATION\"}\nend tell", [[NSBundle mainBundle] bundlePath]];
- ComponentInstance asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
-
- AECreateDesc(typeChar, [script cString], [script cStringLength],
- &scriptDesc);
-
- OSADoScript(asComponent, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc);
-
- AEDisposeDesc(&scriptDesc);
- AEDisposeDesc(&resultDesc);
-
- CloseComponent(asComponent);
- }
- }
- }
-
- if (![defaults integerForKey:@"SongsInAdvance"])
- {
- [defaults setInteger:5 forKey:@"SongsInAdvance"];
- }
-
- if (![defaults objectForKey:@"showName"]) {
- [defaults setBool:YES forKey:@"showName"];
- }
-
- if (![defaults objectForKey:@"showArtist"]) {
- [defaults setBool:YES forKey:@"showArtist"];
- }
-
- if (![defaults objectForKey:@"showAlbum"]) {
- [defaults setBool:NO forKey:@"showAlbum"];
- }
-
- if (![defaults objectForKey:@"showTime"]) {
- [defaults setBool:NO forKey:@"showTime"];
- }
-}
-
- (void)startTimerInNewThread
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
//Recreate the status item menu
- (void)rebuildMenu
{
- NSArray *myMenu = [[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"];
+ NSUserDefaults *defaults;
+ NSArray *myMenu;
+ int playlist;
int i;
+ unichar fullstar = 0x2605;
+ unichar emptystar = 0x2606;
+ NSString *fullStarChar;
+ NSString *emptyStarChar;
+
+ if ([currentRemote playerRunningState] == ITMTRemotePlayerNotRunning) {
+ return;
+ }
+
+ defaults = [NSUserDefaults standardUserDefaults];
+ myMenu = [defaults arrayForKey:@"menu"];
+ playlist = [currentRemote currentPlaylistIndex];
+ fullStarChar = [NSString stringWithCharacters:&fullstar length:1];
+ emptyStarChar = [NSString stringWithCharacters:&emptystar length:1];
trackInfoIndex = -1;
lastPlaylistIndex = -1;
- didHaveAlbumName = ([[currentRemote currentSongAlbum] length] > 0);
- didHaveArtistName = ([[currentRemote currentSongArtist] length] > 0);
- [menu autorelease];
+ [menu release];
menu = [[NSMenu alloc] initWithTitle:@""];
- /*while ([menu numberOfItems] > 0) {
- [menu removeItemAtIndex:0];
- }*/
-
+ //Release the old submenus
playPauseItem = nil;
- lastSongIdentifier = @"0-0";
-
upcomingSongsItem = nil;
[upcomingSongsMenu release];
upcomingSongsMenu = nil;
-
- ratingItem = nil;
- [ratingMenu release];
- ratingMenu = nil;
-
playlistItem = nil;
[playlistMenu release];
playlistMenu = nil;
-
eqItem = nil;
[eqMenu release];
eqMenu = nil;
+ if (ratingItem) {
+ [ratingItem setSubmenu:nil];
+ [ratingItem release];
+ ratingItem = nil;
+ }
+
+ //Build the rating menu
+ [ratingMenu release];
+ ratingMenu = [[NSMenu alloc] initWithTitle:@""];
+ [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:0];
+ [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:20];
+ [[ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""] setTag:40];
+ [[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];
+ //Build the custom menu
for (i = 0; i < [myMenu count]; i++) {
NSString *item = [myMenu objectAtIndex:i];
if ([item isEqualToString:@"Play/Pause"]) {
- KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PlayPause"];
+ ITKeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PlayPause"];
playPauseItem = [menu addItemWithTitle:@"Play"
action:@selector(playPause:)
keyEquivalent:@""];
[tempCombo release];
}
} else if ([item isEqualToString:@"Next Track"]) {
- KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"NextTrack"];
+ ITKeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"NextTrack"];
NSMenuItem *nextTrack = [menu addItemWithTitle:@"Next Track"
action:@selector(nextSong:)
keyEquivalent:@""];
[tempCombo release];
}
} else if ([item isEqualToString:@"Previous Track"]) {
- KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PrevTrack"];
+ ITKeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PrevTrack"];
NSMenuItem *prevTrack = [menu addItemWithTitle:@"Previous Track"
action:@selector(prevSong:)
keyEquivalent:@""];
[menu addItemWithTitle:@"Rewind"
action:@selector(rewind:)
keyEquivalent:@""];
+ } else if ([item isEqualToString:@"Show Player"]) {
+ [menu addItemWithTitle:[NSString stringWithFormat:@"Show %@", [currentRemote playerSimpleName]]
+ action:@selector(showPlayer:)
+ keyEquivalent:@""];
} else if ([item isEqualToString:@"Upcoming Songs"]) {
upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs"
action:nil
keyEquivalent:@""];
+ upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""];
+ [upcomingSongsItem setSubmenu:upcomingSongsMenu];
+ [upcomingSongsItem setEnabled:NO];
} else if ([item isEqualToString:@"Playlists"]) {
playlistItem = [menu addItemWithTitle:@"Playlists"
action:nil
eqItem = [menu addItemWithTitle:@"EQ Presets"
action:nil
keyEquivalent:@""];
- } else if ([item isEqualToString:@"PreferencesÉ"]) {
- [menu addItemWithTitle:@"PreferencesÉ"
+ } else if ([item isEqualToString:@"Preferences…"]) {
+ [menu addItemWithTitle:@"Preferences…"
action:@selector(showPreferences:)
keyEquivalent:@""];
} else if ([item isEqualToString:@"Quit"]) {
- [menu addItemWithTitle:@"Quit"
- action:@selector(quitMenuTunes:)
- keyEquivalent:@""];
+ [[menu addItemWithTitle:@"Quit"
+ action:@selector(terminate:)
+ keyEquivalent:@""] setTarget:NSApp];
} else if ([item isEqualToString:@"Current Track Info"]) {
trackInfoIndex = [menu numberOfItems];
[menu addItemWithTitle:@"No Song"
action:nil
keyEquivalent:@""];
} else if ([item isEqualToString:@"Song Rating"]) {
- unichar fullstar = 0x2605;
- unichar emptystar = 0x2606;
- NSString *fullStarChar = [NSString stringWithCharacters:&fullstar length:1];
- NSString *emptyStarChar = [NSString stringWithCharacters:&emptystar length:1];
- NSMenuItem *item;
-
- ratingItem = [menu addItemWithTitle:@"Song Rating"
+ ratingItem = [[menu addItemWithTitle:@"Song Rating"
action:nil
- keyEquivalent:@""];
-
- ratingMenu = [[NSMenu alloc] initWithTitle:@""];
-
- item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
- [item setTag:0];
-
- item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
- [item setTag:20];
+ keyEquivalent:@""] retain];
+ [ratingItem setSubmenu:ratingMenu];
+ } else if ([item isEqualToString:@"<separator>"]) {
+ [menu addItem:[NSMenuItem separatorItem]];
+ }
+ }
+
+ if (playlistItem) {
+ [self rebuildPlaylistMenu];
+ }
+
+ if (eqItem) {
+ [self rebuildEQPresetsMenu];
+ }
+
+ isPlayingRadio = ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist);
+
+ if (upcomingSongsItem) {
+ [self rebuildUpcomingSongsMenu];
+ }
+
+ if (ratingItem) {
+ if (isPlayingRadio || !playlist) {
+ [ratingItem setEnabled:NO];
+ } else {
+ int currentSongRating = ([currentRemote currentSongRating] * 5);
+ lastSongRating = currentSongRating;
+ [[ratingMenu itemAtIndex:lastSongRating] setState:NSOnState];
+ [ratingItem setEnabled:YES];
+ }
+ }
+
+ //Set the new unique song identifier
+ lastSongIdentifier = [[currentRemote playerStateUniqueIdentifier] retain];
+
+ //If we're in a playlist or radio mode
+ if ( ![lastSongIdentifier isEqualToString:@"0-0"] && (trackInfoIndex > -1) ) {
+ NSString *title;
+
+ 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 (!isPlayingRadio) {
+ if ([defaults boolForKey:@"showTime"]) {
+ NSString *length = [currentRemote currentSongLength];
+ char character = [length characterAtIndex:0];
+ if ( (character > '0') && (character < '9') ) {
+ [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", [currentRemote currentSongLength]] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+ }
+ }
- item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, emptyStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
- [item setTag:40];
+ 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];
+ }
+ }
- item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, emptyStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
- [item setTag:60];
+ if ([defaults boolForKey:@"showArtist"]) {
+ NSString *artist = [currentRemote currentSongArtist];
+ if ([artist length] > 0) {
+ [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", artist] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+ }
+ }
- item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, emptyStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
- [item setTag:80];
+ 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];
+ }
+ }
- item = [ratingMenu addItemWithTitle:[NSString stringWithFormat:@"%@%@%@%@%@", fullStarChar, fullStarChar, fullStarChar, fullStarChar, fullStarChar] action:@selector(selectSongRating:) keyEquivalent:@""];
- [item setTag:100];
- } else if ([item isEqualToString:@"<separator>"]) {
- [menu addItem:[NSMenuItem separatorItem]];
+ if ([defaults boolForKey:@"showAlbum"]) {
+ NSString *album = [currentRemote currentSongAlbum];
+ if ( album ) {
+ [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", album] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+ }
+ }
+ }
+
+ if ([title length] > 0) {
+ [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", title] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
}
}
[statusItem setMenu:menu];
- [self updateMenu];
-
[self clearHotKeys];
[self setupHotKeys];
}
- (void)rebuildPlaylistMenu
{
NSArray *playlists = [currentRemote playlists];
- int i, curPlaylist = [currentRemote currentPlaylistIndex];
-
- if (playlistMenu && ([playlists count] == [playlistMenu numberOfItems]))
- return;
+ int i, currentPlaylist = [currentRemote currentPlaylistIndex];
[playlistMenu release];
playlistMenu = [[NSMenu alloc] initWithTitle:@""];
NSString *playlistName = [playlists objectAtIndex:i];
NSMenuItem *tempItem;
tempItem = [[NSMenuItem alloc] initWithTitle:playlistName action:@selector(selectPlaylist:) keyEquivalent:@""];
- [tempItem setRepresentedObject:[NSNumber numberWithInt:i + 1]];
+ [tempItem setTag:i + 1];
[playlistMenu addItem:tempItem];
[tempItem release];
}
[playlistItem setSubmenu:playlistMenu];
[playlistItem setEnabled:YES];
- if (!isPlayingRadio) {
- [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOnState];
+ if (!isPlayingRadio && currentPlaylist) {
+ [[playlistMenu itemAtIndex:currentPlaylist - 1] setState:NSOnState];
}
}
- (void)rebuildEQPresetsMenu
{
NSArray *eqPresets = [currentRemote eqPresets];
- NSMenuItem *enabledItem;
int i;
- if (eqMenu && ([[currentRemote eqPresets] count] == [eqMenu numberOfItems]))
- return;
-
- [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 *setName = [eqPresets objectAtIndex:i];
+ NSString *name;
NSMenuItem *tempItem;
- if (setName) {
- tempItem = [[NSMenuItem alloc] initWithTitle:setName action:@selector(selectEQPreset:) keyEquivalent:@""];
- [tempItem setTag:i];
- [eqMenu addItem:tempItem];
- [tempItem release];
+ if ( ( name = [eqPresets objectAtIndex:i] ) ) {
+ tempItem = [[NSMenuItem alloc] initWithTitle:name action:@selector(selectEQPreset:) keyEquivalent:@""];
+ [tempItem setTag:i];
+ [eqMenu addItem:tempItem];
+ [tempItem autorelease];
}
}
- [eqItem setSubmenu:eqMenu];
- [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex] + 1] setState:NSOnState];
+ [eqItem setSubmenu:eqMenu];
+ [eqItem setEnabled:YES];
+ [[eqMenu itemAtIndex:([currentRemote currentEQPresetIndex] - 1)] setState:NSOnState];
+}
+
+- (void)updateRatingMenu
+{
+ int currentSongRating = ([currentRemote currentSongRating] * 5);
+ if ([currentRemote currentPlaylistIndex] && (currentSongRating != lastSongRating)) {
+ if ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist) {
+ return;
+ }
+ [[ratingMenu itemAtIndex:lastSongRating] setState:NSOffState];
+ lastSongRating = currentSongRating;
+ [[ratingMenu itemAtIndex:lastSongRating] setState:NSOnState];
+ }
}
- (void)timerUpdate
{
- NSString *currentIdentifier = [currentRemote currentSongUniqueIdentifier];
- if (![lastSongIdentifier isEqualToString:currentIdentifier]) {
- [self updateMenu];
- } else if (!isPlayingRadio && ([currentRemote classOfPlaylistAtIndex:[currentRemote currentPlaylistIndex]] == ITMTRemotePlayerRadioPlaylist)) {
+ NSString *currentIdentifier = [currentRemote playerStateUniqueIdentifier];
+ if (![lastSongIdentifier isEqualToString:currentIdentifier] ||
+ (!isPlayingRadio && ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist))) {
+ //
+ //
+ // If we want to show the new track floater, do it here!
+ //[self showCurrentTrackInfoStatusWindow];
+ //
+ //
[self rebuildMenu];
}
+ [self updateRatingMenu];
+
//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 {
}
}
-- (void)updateMenu
-{
- NSUserDefaults *defaults;
- int playlist = [currentRemote currentPlaylistIndex];
- BOOL wasPlayingRadio = isPlayingRadio;
-
- if ( (isAppRunning == ITMTRemotePlayerNotRunning) ) {
- return;
- }
-
- defaults = [NSUserDefaults standardUserDefaults];
-
- isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist);
-
- //
- //
- //rebuild submenus, make them properly enabled for once...
- //
- //
-
- if ( (trackInfoIndex > -1) && (playlist) ) {
- NSString *title, *album, *artist;
- int temp;
-
- lastSongIdentifier = [[currentRemote currentSongUniqueIdentifier] retain];
-
- if ( (temp = [menu indexOfItemWithTitle:@"No Song"]) && (temp > -1) ) {
- [menu removeItemAtIndex:temp];
- [menu insertItemWithTitle:@"Now Playing" action:NULL keyEquivalent:@"" atIndex:temp];
- } else {
- if ([defaults boolForKey:@"showName"]) {
- [menu removeItemAtIndex:trackInfoIndex + 1];
- }
- }
-
- title = [currentRemote currentSongTitle];
-
- if (!wasPlayingRadio && (temp == -1)) {
- if (didHaveAlbumName && [defaults boolForKey:@"showAlbum"]) {
- [menu removeItemAtIndex:trackInfoIndex + 1];
- }
- if (didHaveArtistName && [defaults boolForKey:@"showArtist"]) {
- [menu removeItemAtIndex:trackInfoIndex + 1];
- }
- if ([defaults boolForKey:@"showTime"]) {
- [menu removeItemAtIndex:trackInfoIndex + 1];
- }
- }
-
- if (!isPlayingRadio) {
- ([defaults boolForKey:@"showAlbum"]) ? (album = [currentRemote currentSongAlbum]) :
- (album = @"");
- ([defaults boolForKey:@"showArtist"]) ? (artist = [currentRemote currentSongArtist]) :
- (artist = @"");
- if ([defaults boolForKey:@"showTime"]) {
- [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", [currentRemote currentSongLength]] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
- }
-
- if ([artist length] > 0) {
- [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", artist] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
- }
-
- if ([album length] > 0) {
- [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", album] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
- }
-
- if ([defaults boolForKey:@"showArtist"]) {
- didHaveArtistName = (([artist length] > 0) ? YES : NO);
- }
-
- if ([defaults boolForKey:@"showAlbum"]) {
- didHaveAlbumName = (([album length] > 0) ? YES : NO);
- }
- }
-
- if ([title length] > 0) {
- [menu insertItemWithTitle:[NSString stringWithFormat:@" %@", title] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
- }
- }
-}
-
-
//
//
// Menu Selectors
- (void)selectPlaylist:(id)sender
{
- int playlist = [[sender representedObject] intValue];
- if (!isPlayingRadio) {
- int curPlaylist = [currentRemote currentPlaylistIndex];
- if (curPlaylist > 0) {
- [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOffState];
- }
- }
+ int playlist = [sender tag];
[currentRemote switchToPlaylistAtIndex:playlist];
- [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState];
- [self updateMenu];
}
- (void)selectEQPreset:(id)sender
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
{
- [[ratingMenu itemAtIndex:([currentRemote currentSongRating] / 20)] setState:NSOffState];
- [currentRemote setCurrentSongRating:(float)[sender tag] / 100.0];
+ int newRating = [sender tag];
+ [[ratingMenu itemAtIndex:lastSongRating] setState:NSOffState];
[sender setState:NSOnState];
+ [currentRemote setCurrentSongRating:(float)newRating / 100.0];
+ lastSongRating = newRating / 20;
}
- (void)playPause:(id)sender
//
//
-- (void)quitMenuTunes:(id)sender
-{
- [NSApp terminate:self];
-}
- (void)showPlayer:(id)sender
{
- (void)showPreferences:(id)sender
{
- if (!prefsController) {
- prefsController = [[PreferencesController alloc] initWithMenuTunes:self];
- [self clearHotKeys];
- }
+ [[PreferencesController sharedPrefs] setController:self];
+ [[PreferencesController sharedPrefs] showPrefsWindow:self];
}
- (void)closePreferences
if ( ( isAppRunning == ITMTRemotePlayerRunning) ) {
[self setupHotKeys];
}
- [prefsController release];
- prefsController = nil;
}
+- (ITMTRemote *)currentRemote
+{
+ return currentRemote;
+}
//
//
- (void)clearHotKeys
{
- [[HotKeyCenter sharedCenter] removeHotKey:@"PlayPause"];
- [[HotKeyCenter sharedCenter] removeHotKey:@"NextTrack"];
- [[HotKeyCenter sharedCenter] removeHotKey:@"PrevTrack"];
- [[HotKeyCenter sharedCenter] removeHotKey:@"TrackInfo"];
- [[HotKeyCenter sharedCenter] removeHotKey:@"UpcomingSongs"];
+ [[ITHotKeyCenter sharedCenter] removeHotKey:@"PlayPause"];
+ [[ITHotKeyCenter sharedCenter] removeHotKey:@"NextTrack"];
+ [[ITHotKeyCenter sharedCenter] removeHotKey:@"PrevTrack"];
+ [[ITHotKeyCenter sharedCenter] removeHotKey:@"ToggleVisualizer"];
+ [[ITHotKeyCenter sharedCenter] removeHotKey:@"TrackInfo"];
+ [[ITHotKeyCenter sharedCenter] removeHotKey:@"UpcomingSongs"];
+ [[ITHotKeyCenter sharedCenter] removeHotKey:@"ToggleLoop"];
+ [[ITHotKeyCenter sharedCenter] removeHotKey:@"ToggleShuffle"];
+ [[ITHotKeyCenter sharedCenter] removeHotKey:@"IncrementVolume"];
+ [[ITHotKeyCenter sharedCenter] removeHotKey:@"DecrementVolume"];
+ [[ITHotKeyCenter sharedCenter] removeHotKey:@"IncrementRating"];
+ [[ITHotKeyCenter sharedCenter] removeHotKey:@"DecrementRating"];
}
- (void)setupHotKeys
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
if ([defaults objectForKey:@"PlayPause"] != nil) {
- [[HotKeyCenter sharedCenter] addHotKey:@"PlayPause"
+ [[ITHotKeyCenter sharedCenter] addHotKey:@"PlayPause"
combo:[defaults keyComboForKey:@"PlayPause"]
target:self action:@selector(playPause:)];
}
if ([defaults objectForKey:@"NextTrack"] != nil) {
- [[HotKeyCenter sharedCenter] addHotKey:@"NextTrack"
+ [[ITHotKeyCenter sharedCenter] addHotKey:@"NextTrack"
combo:[defaults keyComboForKey:@"NextTrack"]
target:self action:@selector(nextSong:)];
}
if ([defaults objectForKey:@"PrevTrack"] != nil) {
- [[HotKeyCenter sharedCenter] addHotKey:@"PrevTrack"
+ [[ITHotKeyCenter sharedCenter] addHotKey:@"PrevTrack"
combo:[defaults keyComboForKey:@"PrevTrack"]
target:self action:@selector(prevSong:)];
}
+ if ([defaults objectForKey:@"ToggleVisualizer"] != nil) {
+ [[ITHotKeyCenter sharedCenter] addHotKey:@"ToggleVisualizer"
+ combo:[defaults keyComboForKey:@"ToggleVisualizer"]
+ target:self action:@selector(toggleVisualizer)];
+ }
+
if ([defaults objectForKey:@"TrackInfo"] != nil) {
- [[HotKeyCenter sharedCenter] addHotKey:@"TrackInfo"
+ [[ITHotKeyCenter sharedCenter] addHotKey:@"TrackInfo"
combo:[defaults keyComboForKey:@"TrackInfo"]
- target:self action:@selector(showCurrentTrackInfo)];
+ target:self action:@selector(showCurrentTrackInfoStatusWindow)];
}
if ([defaults objectForKey:@"UpcomingSongs"] != nil) {
- [[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs"
+ [[ITHotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs"
combo:[defaults keyComboForKey:@"UpcomingSongs"]
- target:self action:@selector(showUpcomingSongs)];
+ target:self action:@selector(showUpcomingSongsStatusWindow)];
+ }
+
+ if ([defaults objectForKey:@"ToggleLoop"] != nil) {
+ [[ITHotKeyCenter sharedCenter] addHotKey:@"ToggleLoop"
+ combo:[defaults keyComboForKey:@"ToggleLoop"]
+ target:self action:@selector(showToggleLoopStatusWindow)];
+ }
+
+ if ([defaults objectForKey:@"ToggleShuffle"] != nil) {
+ [[ITHotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle"
+ combo:[defaults keyComboForKey:@"ToggleShuffle"]
+ target:self action:@selector(showToggleShuffleStatusWindow)];
+ }
+
+ if ([defaults objectForKey:@"IncrementVolume"] != nil) {
+ [[ITHotKeyCenter sharedCenter] addHotKey:@"IncrementVolume"
+ combo:[defaults keyComboForKey:@"IncrementVolume"]
+ target:self action:@selector(showVolumeIncrementStatusWindow)];
+ }
+
+ if ([defaults objectForKey:@"DecrementVolume"] != nil) {
+ [[ITHotKeyCenter sharedCenter] addHotKey:@"DecrementVolume"
+ combo:[defaults keyComboForKey:@"DecrementVolume"]
+ target:self action:@selector(showVolumeDecrementStatusWindow)];
+ }
+
+ if ([defaults objectForKey:@"IncrementRating"] != nil) {
+ [[ITHotKeyCenter sharedCenter] addHotKey:@"IncrementRating"
+ combo:[defaults keyComboForKey:@"IncrementRating"]
+ target:self action:@selector(showRatingIncrementStatusWindow)];
+ }
+
+ if ([defaults objectForKey:@"DecrementRating"] != nil) {
+ [[ITHotKeyCenter sharedCenter] addHotKey:@"DecrementRating"
+ combo:[defaults keyComboForKey:@"DecrementRating"]
+ target:self action:@selector(showRatingDecrementStatusWindow)];
}
}
//
//
-// Show Current Track Info And Show Upcoming Songs Floaters
+// Status Window Methods
//
//
-- (void)showCurrentTrackInfo
+- (void)showCurrentTrackInfoStatusWindow
{
NSString *trackName = [currentRemote currentSongTitle];
if (!statusWindow && [trackName length]) {
if ([defaults boolForKey:@"showAlbum"]) {
NSString *trackAlbum = [currentRemote currentSongAlbum];
- if ([trackAlbum length]) {
+ if ( trackAlbum ) {
stringToShow = [stringToShow stringByAppendingString:trackAlbum];
stringToShow = [stringToShow stringByAppendingString:@"\n"];
}
}
}
- [statusWindow setText:stringToShow];
+ //
+ //SHOW THE STATUS WINDOW HERE WITH STRING stringToShow
+ //
+
+ /*[statusWindow setText:stringToShow];
[NSTimer scheduledTimerWithTimeInterval:3.0
target:self
selector:@selector(fadeAndCloseStatusWindow)
userInfo:nil
- repeats:NO];
+ repeats:NO];*/
}
}
-- (void)showUpcomingSongs
+- (void)showUpcomingSongsStatusWindow
{
int curPlaylist = [currentRemote currentPlaylistIndex];
if (!statusWindow) {
int i;
NSString *songs = @"";
- statusWindow = [ITTransientStatusWindow sharedWindow];
for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
if (i <= numSongs) {
NSString *curSong = [currentRemote songTitleAtIndex:i];
songs = [songs stringByAppendingString:@"\n"];
}
}
- [statusWindow setText:songs];
+
+ //
+ //SHOW STATUS WINDOW HERE WITH STRING songs
+ //
+
+ /*[statusWindow setText:songs];
[NSTimer scheduledTimerWithTimeInterval:3.0
target:self
selector:@selector(fadeAndCloseStatusWindow)
userInfo:nil
- repeats:NO];
+ repeats:NO];*/
}
}
}
+- (void)showVolumeIncrementStatusWindow
+{
+}
+
+- (void)showVolumeDecrementStatusWindow
+{
+}
+
+- (void)showRatingIncrementStatusWindow
+{
+}
+
+- (void)showRatingDecrementStatusWindow
+{
+}
+
+- (void)showToggleLoopStatusWindow
+{
+}
+
+- (void)showToggleShuffleStatusWindow
+{
+}
+
+- (void)toggleVisualizer
+{
+ NSLog(@"Visualizer On/Off");
+}
+
- (void)fadeAndCloseStatusWindow
{
[statusWindow orderOut:self];
case 49:
{
/*MenuRef menuRef = _NSGetCarbonMenu([item menu]);
- NSLog(@"%@", menuRef);
- SetMenuItemCommandKey(menuRef, 0, NO, 49);
- SetMenuItemModifiers(menuRef, 0, kMenuNoCommandModifier);
- SetMenuItemKeyGlyph(menuRef, 0, kMenuBlankGlyph);
- charcode = 'b';*/
+ SetMenuItemCommandKey(menuRef, 1, NO, 49);
+ SetMenuItemModifiers(menuRef, 1, kMenuNoCommandModifier);
+ SetMenuItemKeyGlyph(menuRef, 1, kMenuBlankGlyph);*/
+ charcode = 'b';
+
}
break;
git.ithinksw.org / MenuTunes.git / blobdiff