-/*
-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 "StatusWindowController.h"
+#import "StatusWindow.h"
@interface MenuTunes(Private)
- (ITMTRemote *)loadRemote;
{
if ( ( self = [super init] ) ) {
remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
+ statusWindow = [StatusWindow sharedWindow];
}
return self;
}
currentRemote = [self loadRemote];
[currentRemote begin];
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(iTunesTerminated:) name:@"ITMTRemoteAppDidTerminateNotification" object:nil];
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(iTunesLaunched:) name:@"ITMTRemoteAppDidLaunchNotification" object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(remotePlayerTerminated:) name:@"ITMTRemoteAppDidTerminateNotification" object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(remotePlayerLaunched:) name:@"ITMTRemoteAppDidLaunchNotification" object:nil];
[self registerDefaultsIfNeeded];
menu = [[NSMenu alloc] initWithTitle:@""];
- isAppRunning = [currentRemote isAppRunning];
- if (isAppRunning)
- {
- [self rebuildMenu];
- refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5
- target:self
- selector:@selector(timerUpdate)
- userInfo:nil
- repeats:YES];
- }
- else
- {
- menu = [[NSMenu alloc] initWithTitle:@""];
- [[menu addItemWithTitle:@"Open iTunes" action:@selector(openiTunes:) keyEquivalent:@""] setTarget:self];
- [[menu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
- [[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
- refreshTimer = nil;
+ if ( ( [currentRemote playerRunningState] == ITMTRemotePlayerRunning ) ) {
+ [self remotePlayerLaunched:nil];
+ } else {
+ [self remotePlayerTerminated:nil];
}
-
- statusItem = [[ITStatusItem alloc] initWithStatusBar:[NSStatusBar systemStatusBar]
- withLength:NSSquareStatusItemLength];
+
+ statusItem = [[ITStatusItem alloc] initWithStatusBar:[NSStatusBar systemStatusBar] withLength:NSSquareStatusItemLength];
[statusItem setImage:[NSImage imageNamed:@"menu"]];
[statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]];
- (ITMTRemote *)loadRemote
{
NSString *folderPath = [[NSBundle mainBundle] builtInPlugInsPath];
-
+
if (folderPath) {
NSArray *bundlePathList = [NSBundle pathsForResourcesOfType:@"remote" inDirectory:folderPath];
NSEnumerator *enumerator = [bundlePathList objectEnumerator];
}
}
-// if ( [remoteArray count] > 0 ) {
+// if ( [remoteArray count] > 0 ) { // UNCOMMENT WHEN WE HAVE > 1 PLUGIN
// if ( [remoteArray count] > 1 ) {
// [remoteArray sortUsingSelector:@selector(sortAlpha:)];
// }
// [self loadModuleAccessUI]; //Comment out this line to disable remote visibility
// }
}
- NSLog(@"%@", [remoteArray objectAtIndex:0]);
+// NSLog(@"%@", [remoteArray objectAtIndex:0]); //DEBUG
return [remoteArray objectAtIndex:0];
}
@"<separator>",
@"Upcoming Songs",
@"Playlists",
+ @"Song Rating",
@"<separator>",
@"PreferencesÉ",
@"Quit",
trackInfoIndex = -1;
lastSongIndex = -1;
+ lastPlaylistIndex = -1;
didHaveAlbumName = ([[currentRemote currentSongAlbum] length] > 0);
didHaveArtistName = ([[currentRemote currentSongArtist] length] > 0);
playPauseMenuItem = nil;
upcomingSongsItem = nil;
+ songRatingMenuItem = nil;
playlistItem = nil;
[playlistMenu release];
playlistMenu = nil;
keyEquivalent:@""];
[playPauseMenuItem setTarget:self];
- if (tempCombo)
- {
+ if (tempCombo) {
[self setKeyEquivalentForCode:[tempCombo keyCode]
andModifiers:[tempCombo modifiers] onItem:playPauseMenuItem];
[tempCombo release];
keyEquivalent:@""];
[nextTrack setTarget:self];
- if (tempCombo)
- {
+ if (tempCombo) {
[self setKeyEquivalentForCode:[tempCombo keyCode]
andModifiers:[tempCombo modifiers] onItem:nextTrack];
[tempCombo release];
keyEquivalent:@""];
[prevTrack setTarget:self];
- if (tempCombo)
- {
+ if (tempCombo) {
[self setKeyEquivalentForCode:[tempCombo keyCode]
andModifiers:[tempCombo modifiers] onItem:prevTrack];
[tempCombo release];
}
} else if ([item isEqualToString:@"Fast Forward"]) {
[[menu addItemWithTitle:@"Fast Forward"
- action:@selector(fastForward:)
- keyEquivalent:@""] setTarget:self];
+ action:@selector(fastForward:)
+ keyEquivalent:@""] setTarget:self];
} else if ([item isEqualToString:@"Rewind"]) {
[[menu addItemWithTitle:@"Rewind"
- action:@selector(rewind:)
- keyEquivalent:@""] setTarget:self];
+ action:@selector(rewind:)
+ keyEquivalent:@""] setTarget:self];
} else if ([item isEqualToString:@"Upcoming Songs"]) {
upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs"
- action:nil
- keyEquivalent:@""];
+ action:nil
+ keyEquivalent:@""];
} else if ([item isEqualToString:@"Playlists"]) {
playlistItem = [menu addItemWithTitle:@"Playlists"
- action:nil
- keyEquivalent:@""];
+ action:nil
+ keyEquivalent:@""];
} else if ([item isEqualToString:@"EQ Presets"]) {
eqItem = [menu addItemWithTitle:@"EQ Presets"
- action:nil
- keyEquivalent:@""];
+ action:nil
+ keyEquivalent:@""];
} else if ([item isEqualToString:@"PreferencesÉ"]) {
[[menu addItemWithTitle:@"PreferencesÉ"
- action:@selector(showPreferences:)
- keyEquivalent:@""] setTarget:self];
+ action:@selector(showPreferences:)
+ keyEquivalent:@""] setTarget:self];
} else if ([item isEqualToString:@"Quit"]) {
[[menu addItemWithTitle:@"Quit"
- action:@selector(quitMenuTunes:)
- keyEquivalent:@""] setTarget:self];
+ action:@selector(quitMenuTunes:)
+ keyEquivalent:@""] setTarget:self];
} else if ([item isEqualToString:@"Current Track Info"]) {
trackInfoIndex = [menu numberOfItems];
[menu addItemWithTitle:@"No Song"
- action:nil
- keyEquivalent:@""];
+ action:nil
+ keyEquivalent:@""];
+ } else if ([item isEqualToString:@"Song Rating"]) {
+ NSMenuItem *item;
+ int i;
+ NSString *curTitle = @".....";
+
+ songRatingMenuItem = [menu addItemWithTitle:@"Song Rating"
+ action:nil
+ keyEquivalent:@""];
+
+ ratingMenu = [[NSMenu alloc] initWithTitle:@""];
+
+ item = [ratingMenu addItemWithTitle:@"....."
+ action:@selector(setSongRating:)
+ keyEquivalent:@""];
+ [item setTarget:self];
+ [item setTag:0];
+
+ for (i = 1; i < 6; i++) {
+ curTitle = [curTitle substringToIndex:4];
+ curTitle = [@"x" stringByAppendingString:curTitle];
+ item = [ratingMenu addItemWithTitle:curTitle
+ action:@selector(setSongRating:)
+ keyEquivalent:@""];
+ [item setTarget:self];
+ [item setTag:(i * 20)];
+ }
} else if ([item isEqualToString:@"<separator>"]) {
[menu addItem:[NSMenuItem separatorItem]];
}
NSMenuItem *menuItem;
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- if (!isAppRunning) {
+ if ( ( isAppRunning == ITMTRemotePlayerNotRunning ) ) {
return;
}
if (eqItem) {
[self rebuildEQPresetsMenu];
}
-
- if (trackInfoIndex > -1)
- {
+ if (trackInfoIndex > -1) {
NSString *curSongName, *curAlbumName = @"", *curArtistName = @"";
curSongName = [currentRemote currentSongTitle];
if (!isPlayingRadio) {
if ([defaults boolForKey:@"showTime"]) {
menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", [currentRemote currentSongLength]]
- action:nil
- keyEquivalent:@""];
+ action:nil
+ keyEquivalent:@""];
[menu insertItem:menuItem atIndex:trackInfoIndex + 1];
[menuItem release];
}
if ([curArtistName length] > 0) {
menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curArtistName]
- action:nil
- keyEquivalent:@""];
+ action:nil
+ keyEquivalent:@""];
[menu insertItem:menuItem atIndex:trackInfoIndex + 1];
[menuItem release];
}
if ([curAlbumName length] > 0) {
menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curAlbumName]
- action:nil
- keyEquivalent:@""];
+ action:nil
+ keyEquivalent:@""];
[menu insertItem:menuItem atIndex:trackInfoIndex + 1];
[menuItem release];
}
+
+ if (songRatingMenuItem) {
+ int rating = (int)[currentRemote currentSongRating] * 10;
+ int i;
+ for (i = 0; i < 5; i++) {
+ [[ratingMenu itemAtIndex:i] setState:NSOffState];
+ [[ratingMenu itemAtIndex:i] setTarget:self];
+ }
+ [[ratingMenu itemAtIndex:rating / 2] setState:NSOnState];
+ }
}
if ([defaults boolForKey:@"showName"]) {
menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curSongName]
- action:nil
- keyEquivalent:@""];
+ action:nil
+ keyEquivalent:@""];
[menu insertItem:menuItem atIndex:trackInfoIndex + 1];
[menuItem release];
}
[menu removeItemAtIndex:[menu indexOfItemWithTitle:@"No Song"]];
[menu insertItem:menuItem atIndex:trackInfoIndex];
[menuItem release];
+
+ [songRatingMenuItem setSubmenu:ratingMenu];
+ [songRatingMenuItem setEnabled:YES];
}
} else if ([menu indexOfItemWithTitle:@"No Song"] == -1) {
[menu removeItemAtIndex:trackInfoIndex];
didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);
}
}
+ [menu update];
}
//Rebuild the upcoming songs submenu. Can be improved a lot.
int curIndex = [currentRemote currentPlaylistIndex];
int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curIndex];
int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];
+
if (!isPlayingRadio) {
if (numSongs > 0) {
int curTrack = [currentRemote currentSongIndex];
NSMenuItem *songItem;
songItem = [[NSMenuItem alloc] initWithTitle:curSong action:@selector(playTrack:) keyEquivalent:@""];
[songItem setTarget:self];
- [songItem setRepresentedObject:[NSNumber numberWithInt:i + 1]];
+ [songItem setRepresentedObject:[NSNumber numberWithInt:i]];
[upcomingSongsMenu addItem:songItem];
[songItem release];
} else {
NSArray *playlists = [currentRemote playlists];
int i, curPlaylist = [currentRemote currentPlaylistIndex];
- if (isPlayingRadio)
- {
+ if (isPlayingRadio) {
curPlaylist = 0;
}
if (playlistMenu && ([playlists count] == [playlistMenu numberOfItems]))
[tempItem release];
}
[playlistItem setSubmenu:playlistMenu];
+ [playlistItem setEnabled:YES];
if (curPlaylist) {
[[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOnState];
- (void)rebuildEQPresetsMenu
{
NSArray *eqPresets = [currentRemote eqPresets];
+ NSMenuItem *enabledItem;
int i;
if (eqMenu && ([[currentRemote eqPresets] count] == [eqMenu numberOfItems]))
[eqMenu release];
eqMenu = [[NSMenu alloc] initWithTitle:@""];
+ enabledItem = [eqMenu addItemWithTitle:@"Disabled"
+ action:@selector(toggleEqualizer)
+ keyEquivalent:@""];
+
+ if ([currentRemote equalizerEnabled] == NO) {
+ [enabledItem setState:NSOnState];
+ }
+
+ [eqMenu addItem:[NSMenuItem separatorItem]];
+
for (i = 0; i < [eqPresets count]; i++) {
NSString *setName = [eqPresets objectAtIndex:i];
NSMenuItem *tempItem;
+ if (setName) {
tempItem = [[NSMenuItem alloc] initWithTitle:setName action:@selector(selectEQPreset:) keyEquivalent:@""];
[tempItem setTarget:self];
[tempItem setRepresentedObject:[NSNumber numberWithInt:i]];
[eqMenu addItem:tempItem];
[tempItem release];
+ }
}
[eqItem setSubmenu:eqMenu];
- [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex] - 1] setState:NSOnState];
+ [[eqMenu itemAtIndex:[currentRemote currentEQPresetIndex] + 1] setState:NSOnState];
}
- (void)clearHotKeys
//Called when the timer fires.
- (void)timerUpdate
{
- if ([currentRemote playerState] != stopped) {
+ int playlist = [currentRemote currentPlaylistIndex];
+ ITMTRemotePlayerPlayingState playerPlayingState = [currentRemote playerPlayingState];
+
+ if ((playlist > 0) || playerPlayingState != ITMTRemotePlayerStopped) {
int trackPlayingIndex = [currentRemote currentSongIndex];
- int playlist = [currentRemote currentPlaylistIndex];
if (trackPlayingIndex != lastSongIndex) {
BOOL wasPlayingRadio = isPlayingRadio;
- isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"];
+ isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist);
+
if (isPlayingRadio && !wasPlayingRadio) {
int i;
for (i = 0; i < [playlistMenu numberOfItems]; i++)
{
[[playlistMenu itemAtIndex:i] setState:NSOffState];
}
+ } else {
+ [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState];
}
+
if (wasPlayingRadio) {
NSMenuItem *temp = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""];
[menu insertItem:temp atIndex:trackInfoIndex + 1];
[temp release];
}
+
[self updateMenu];
lastSongIndex = trackPlayingIndex;
- }
- else
- {
- if (playlist != [currentRemote currentPlaylistIndex]) {
+ } else {
+ if (playlist != lastPlaylistIndex) {
BOOL wasPlayingRadio = isPlayingRadio;
- isPlayingRadio = [[currentRemote classOfPlaylistAtIndex:playlist] isEqualToString:@"radio tuner playlist"];
+ isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist);
+
if (isPlayingRadio && !wasPlayingRadio) {
int i;
- for (i = 0; i < [playlistMenu numberOfItems]; i++)
- {
+ for (i = 0; i < [playlistMenu numberOfItems]; i++) {
[[playlistMenu itemAtIndex:i] setState:NSOffState];
}
}
+
if (wasPlayingRadio) {
NSMenuItem *temp = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""];
[menu insertItem:temp atIndex:trackInfoIndex + 1];
[temp release];
}
+
+ if (!isPlayingRadio) {
+ int i;
+ for (i = 0; i < [playlistMenu numberOfItems]; i++)
+ {
+ [[playlistMenu itemAtIndex:i] setState:NSOffState];
+ }
+ [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState];
+ }
+
[self updateMenu];
lastSongIndex = trackPlayingIndex;
+ lastPlaylistIndex = playlist;
}
}
//Update Play/Pause menu item
if (playPauseMenuItem){
- if ([currentRemote playerState] == playing) {
+ if (playerPlayingState == ITMTRemotePlayerPlaying) {
[playPauseMenuItem setTitle:@"Pause"];
} else {
[playPauseMenuItem setTitle:@"Play"];
}
}
+ } else if ((lastPlaylistIndex > 0) && (playlist == 0)) {
+ NSMenuItem *menuItem;
+ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+ //Remote the now playing item and add no song item
+ [menu removeItemAtIndex:trackInfoIndex];
+
+ if ([defaults boolForKey:@"showName"] == YES) {
+ [menu removeItemAtIndex:trackInfoIndex];
+ }
+
+ if ([defaults boolForKey:@"showTime"] == YES) {
+ [menu removeItemAtIndex:trackInfoIndex];
+ }
+
+ if (didHaveArtistName && [defaults boolForKey:@"showArtist"]) {
+ [menu removeItemAtIndex:trackInfoIndex];
+ }
+
+ if (didHaveAlbumName && [defaults boolForKey:@"showAlbum"]) {
+ [menu removeItemAtIndex:trackInfoIndex];
+ }
+
+ [playPauseMenuItem setTitle:@"Play"];
+
+ didHaveArtistName = NO;
+ didHaveAlbumName = NO;
+ lastPlaylistIndex = -1;
+ lastSongIndex = -1;
+
+ [upcomingSongsItem setSubmenu:nil];
+ [upcomingSongsItem setEnabled:NO];
+
+ [songRatingMenuItem setSubmenu:nil];
+ [songRatingMenuItem setEnabled:NO];
+
+ menuItem = [[NSMenuItem alloc] initWithTitle:@"No Song" action:nil keyEquivalent:@""];
+ [menu insertItem:menuItem atIndex:trackInfoIndex];
+ [menuItem release];
}
}
-- (void)iTunesLaunched:(NSNotification *)note
+- (void)remotePlayerLaunched:(NSNotification *)note
{
- isAppRunning = YES;
+ isAppRunning = ITMTRemotePlayerRunning;
//Restart the timer
- refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
+ [NSThread detachNewThreadSelector:@selector(runTimerInNewThread) toTarget:self withObject:nil];
[self rebuildMenu]; //Rebuild the menu since no songs will be playing
+ if (playlistItem) {
+ [self rebuildPlaylistMenu];
+ }
+ if (eqItem) {
+ [self rebuildEQPresetsMenu];
+ }
[statusItem setMenu:menu]; //Set the menu back to the main one
}
-- (void)iTunesTerminated:(NSNotification *)note
+- (void)runTimerInNewThread
{
- isAppRunning = NO;
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
+ refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES] retain];
+ [runLoop run];
+ [pool release];
+}
+
+- (void)remotePlayerTerminated:(NSNotification *)note
+{
+ isAppRunning = ITMTRemotePlayerNotRunning;
[menu release];
menu = [[NSMenu alloc] initWithTitle:@""];
- [[menu addItemWithTitle:@"Open iTunes" action:@selector(openiTunes:) keyEquivalent:@""] setTarget:self];
+ [menu addItemWithTitle:@"Audio Player" action:NULL keyEquivalent:@""];
+ [menu addItemWithTitle:@"Not Running" action:NULL keyEquivalent:@""];
+ [menu addItem:[NSMenuItem separatorItem]];
[[menu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
[[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
[statusItem setMenu:menu];
[refreshTimer invalidate];
+ [refreshTimer release];
refreshTimer = nil;
[self clearHotKeys];
}
- (void)playTrack:(id)sender
{
[currentRemote switchToSongAtIndex:[[sender representedObject] intValue]];
- [self updateMenu];
}
- (void)selectPlaylist:(id)sender
int playlist = [[sender representedObject] intValue];
if (!isPlayingRadio) {
int curPlaylist = [currentRemote currentPlaylistIndex];
- [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOffState];
+ if (curPlaylist > 0) {
+ [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOffState];
+ }
}
[currentRemote switchToPlaylistAtIndex:playlist];
[[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState];
int curSet = [currentRemote currentEQPresetIndex];
int item = [[sender representedObject] intValue];
[currentRemote switchToEQAtIndex:item];
- [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState];
- [[eqMenu itemAtIndex:item - 1] setState:NSOnState];
+ [[eqMenu itemAtIndex:curSet + 1] setState:NSOffState];
+ [[eqMenu itemAtIndex:item + 2] setState:NSOnState];
}
- (void)playPause:(id)sender
{
- PlayerState state = [currentRemote playerState];
- if (state == playing) {
+ ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState];
+
+ if (state == ITMTRemotePlayerPlaying) {
[currentRemote pause];
[playPauseMenuItem setTitle:@"Play"];
- } else if ((state == forwarding) || (state == rewinding)) {
+ } else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) {
[currentRemote pause];
[currentRemote play];
} else {
- (void)fastForward:(id)sender
{
- [currentRemote fastForward];
+ [currentRemote forward];
[playPauseMenuItem setTitle:@"Play"];
}
[playPauseMenuItem setTitle:@"Play"];
}
+- (void)toggleEqualizer
+{
+ [currentRemote setEqualizerEnabled:![currentRemote equalizerEnabled]];
+}
+
+- (void)setSongRating:(id)sender
+{
+ NSLog(@"%f", [currentRemote currentSongRating]);
+ NSLog(@"%f", (float)[sender tag] / 100.0);
+ [currentRemote setCurrentSongRating:(float)[sender tag] / 100.0];
+}
+
//
//
// Plugin independent selectors
[NSApp terminate:self];
}
-//How is this going to work, now that we're pluginized?
-- (void)openiTunes:(id)sender
-{
- [[NSWorkspace sharedWorkspace] launchApplication:@"iTunes"];
-}
-
- (void)showPreferences:(id)sender
{
if (!prefsController) {
}
}
-
- (void)closePreferences
{
- if (isAppRunning) {
+ if ( ( isAppRunning == ITMTRemotePlayerRunning) ) {
[self setupHotKeys];
}
[prefsController release];
- (void)showCurrentTrackInfo
{
NSString *trackName = [currentRemote currentSongTitle];
- if (!statusController && [trackName length]) {
+ if (!statusWindow && [trackName length]) {
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSString *stringToShow = @"";
}
}
- statusController = [[StatusWindowController alloc] init];
- [statusController setTrackInfo:stringToShow];
+ [statusWindow setText:stringToShow];
[NSTimer scheduledTimerWithTimeInterval:3.0
- target:self
- selector:@selector(fadeAndCloseStatusWindow)
- userInfo:nil
- repeats:NO];
+ target:self
+ selector:@selector(fadeAndCloseStatusWindow)
+ userInfo:nil
+ repeats:NO];
}
}
- (void)showUpcomingSongs
{
int curPlaylist = [currentRemote currentPlaylistIndex];
- if (!statusController) {
+ if (!statusWindow) {
int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curPlaylist];
if (numSongs > 0) {
int i;
NSString *songs = @"";
- statusController = [[StatusWindowController alloc] init];
+ statusWindow = [ITTransientStatusWindow sharedWindow];
for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
if (i <= numSongs) {
NSString *curSong = [currentRemote songTitleAtIndex:i];
songs = [songs stringByAppendingString:@"\n"];
}
}
- [statusController setUpcomingSongs:songs];
+ [statusWindow setText:songs];
[NSTimer scheduledTimerWithTimeInterval:3.0
target:self
selector:@selector(fadeAndCloseStatusWindow)
- (void)fadeAndCloseStatusWindow
{
- [statusController fadeWindowOut];
- [statusController release];
- statusController = nil;
+ [statusWindow orderOut:self];
}
- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
{ shiftKey, NSShiftKeyMask },
};
- for (i = 0; i < 6; i++)
- {
- if (modifiers & carbonToCocoa[i][0])
- {
+ for (i = 0; i < 6; i++) {
+ if (modifiers & carbonToCocoa[i][0]) {
cocoaModifiers += carbonToCocoa[i][1];
}
}
{
if (refreshTimer) {
[refreshTimer invalidate];
+ [refreshTimer release];
refreshTimer = nil;
}
[currentRemote halt];
[super dealloc];
}
-@end
\ No newline at end of file
+@end
git.ithinksw.org / MenuTunes.git / blobdiff