X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/5f3aa6959c1903bcb1194b9d0ec24d33906e4f9d..9fe0abc58552c65940750163388179a2966eb59e:/MainController.m?ds=sidebyside diff --git a/MainController.m b/MainController.m index 3cf10ab..1ad3fc2 100755 --- a/MainController.m +++ b/MainController.m @@ -7,10 +7,11 @@ @interface MainController(Private) - (ITMTRemote *)loadRemote; -- (void)setupHotKeys; - (void)timerUpdate; - (void)setLatestSongIdentifier:(NSString *)newIdentifier; - (void)showCurrentTrackInfo; +- (void)applicationLaunched:(NSNotification *)note; +- (void)applicationTerminated:(NSNotification *)note; @end static MainController *sharedController; @@ -36,7 +37,6 @@ static MainController *sharedController; statusWindowController = [[StatusWindowController alloc] init]; menuController = [[MenuController alloc] init]; df = [[NSUserDefaults standardUserDefaults] retain]; - [self setLatestSongIdentifier:@"0-0"]; } return self; } @@ -58,7 +58,7 @@ static MainController *sharedController; selector:@selector(applicationLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil]; - + if ( ! [df objectForKey:@"menu"] ) { // If this is nil, defaults have never been registered. [[PreferencesController sharedPrefs] registerDefaults]; } @@ -68,6 +68,12 @@ static MainController *sharedController; initWithStatusBar:[NSStatusBar systemStatusBar] withLength:NSSquareStatusItemLength]; + if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) { + [self applicationLaunched:nil]; + } else { + [self applicationTerminated:nil]; + } + [statusItem setImage:[NSImage imageNamed:@"menu"]]; [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]]; } @@ -153,11 +159,15 @@ static MainController *sharedController; - (void)timerUpdate { - if ( ( [self songChanged] ) || + //This huge if statement is being nasty + /*if ( ( [self songChanged] ) || ( ([self radioIsPlaying]) && (latestPlaylistClass != ITMTRemotePlayerRadioPlaylist) ) || - ( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) ) { + ( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) )*/ + + if ([self songChanged]) { [self setLatestSongIdentifier:[currentRemote currentSongUniqueIdentifier]]; latestPlaylistClass = [currentRemote currentPlaylistClass]; + [menuController rebuildSubmenus]; if ( [df boolForKey:@"showSongInfoOnChange"] ) { [self showCurrentTrackInfo]; @@ -234,6 +244,17 @@ static MainController *sharedController; [currentRemote switchToEQAtIndex:index]; } +- (void)showPlayer +{ + if ( ( playerRunningState == ITMTRemotePlayerRunning) ) { + [currentRemote showPrimaryInterface]; + } else { + if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) { + NSLog(@"MenuTunes: Error Launching Player"); + } + } +} + - (void)showPreferences { [[PreferencesController sharedPrefs] setController:self]; @@ -248,17 +269,6 @@ static MainController *sharedController; // // -- (void)showPlayer:(id)sender -{ - if ( ( playerRunningState == ITMTRemotePlayerRunning) ) { - [currentRemote showPrimaryInterface]; - } else { - if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) { - NSLog(@"Error Launching Player"); - } - } -} - - (void)closePreferences { if ( ( playerRunningState == ITMTRemotePlayerRunning) ) { @@ -283,6 +293,7 @@ static MainController *sharedController; [[HotKeyCenter sharedCenter] removeHotKey:@"NextTrack"]; [[HotKeyCenter sharedCenter] removeHotKey:@"PrevTrack"]; [[HotKeyCenter sharedCenter] removeHotKey:@"TrackInfo"]; + [[HotKeyCenter sharedCenter] removeHotKey:@"ShowPlayer"]; [[HotKeyCenter sharedCenter] removeHotKey:@"UpcomingSongs"]; [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleLoop"]; [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleShuffle"]; @@ -297,19 +308,25 @@ static MainController *sharedController; if ([df objectForKey:@"PlayPause"] != nil) { [[HotKeyCenter sharedCenter] addHotKey:@"PlayPause" combo:[df keyComboForKey:@"PlayPause"] - target:self action:@selector(playPause:)]; + target:self action:@selector(playPause)]; } if ([df objectForKey:@"NextTrack"] != nil) { [[HotKeyCenter sharedCenter] addHotKey:@"NextTrack" combo:[df keyComboForKey:@"NextTrack"] - target:self action:@selector(nextSong:)]; + target:self action:@selector(nextSong)]; } if ([df objectForKey:@"PrevTrack"] != nil) { [[HotKeyCenter sharedCenter] addHotKey:@"PrevTrack" combo:[df keyComboForKey:@"PrevTrack"] - target:self action:@selector(prevSong:)]; + target:self action:@selector(prevSong)]; + } + + if ([df objectForKey:@"ShowPlayer"] != nil) { + [[HotKeyCenter sharedCenter] addHotKey:@"ShowPlayer" + combo:[df keyComboForKey:@"ShowPlayer"] + target:self action:@selector(showPlayer)]; } if ([df objectForKey:@"TrackInfo"] != nil) { @@ -327,37 +344,37 @@ static MainController *sharedController; if ([df objectForKey:@"ToggleLoop"] != nil) { [[HotKeyCenter sharedCenter] addHotKey:@"ToggleLoop" combo:[df keyComboForKey:@"ToggleLoop"] - target:self action:NULL/*Set this to something*/]; + target:self action:@selector(toggleLoop)]; } if ([df objectForKey:@"ToggleShuffle"] != nil) { [[HotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle" combo:[df keyComboForKey:@"ToggleShuffle"] - target:self action:NULL/*Set this to something*/]; + target:self action:@selector(toggleShuffle)]; } if ([df objectForKey:@"IncrementVolume"] != nil) { [[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume" combo:[df keyComboForKey:@"IncrementVolume"] - target:self action:NULL/*Set this to something*/]; + target:self action:@selector(incrementVolume)]; } if ([df objectForKey:@"DecrementVolume"] != nil) { [[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume" combo:[df keyComboForKey:@"DecrementVolume"] - target:self action:NULL/*Set this to something*/]; + target:self action:@selector(decrementVolume)]; } if ([df objectForKey:@"IncrementRating"] != nil) { [[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating" combo:[df keyComboForKey:@"IncrementRating"] - target:self action:NULL/*Set this to something*/]; + target:self action:@selector(incrementRating)]; } if ([df objectForKey:@"DecrementRating"] != nil) { [[HotKeyCenter sharedCenter] addHotKey:@"DecrementRating" combo:[df keyComboForKey:@"DecrementRating"] - target:self action:NULL/*Set this to something*/]; + target:self action:@selector(decrementRating)]; } } @@ -402,7 +419,7 @@ static MainController *sharedController; trackTotal:trackTotal rating:rating]; } else { - title = @"No song is playing."; + title = NSLocalizedString(@"noSongPlaying", @"No song is playing."); [statusWindowController showSongWindowWithTitle:title album:nil artist:nil @@ -433,8 +450,89 @@ static MainController *sharedController; [statusWindowController showUpcomingSongsWithTitles:songList]; } else { - [statusWindowController showUpcomingSongsWithTitles:[NSArray arrayWithObject:@"No upcoming songs."]]; + [statusWindowController showUpcomingSongsWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]]; + } +} + +- (void)incrementVolume +{ + float volume = [currentRemote volume]; + volume += 0.2; + if (volume > 1.0) { + volume = 1.0; + } + [currentRemote setVolume:volume]; + + //Show volume status window + [statusWindowController showVolumeWindowWithLevel:volume]; +} + +- (void)decrementVolume +{ + float volume = [currentRemote volume]; + volume -= 0.2; + if (volume < 0.0) { + volume = 0.0; + } + [currentRemote setVolume:volume]; + + //Show volume status window + [statusWindowController showVolumeWindowWithLevel:volume]; +} + +- (void)incrementRating +{ + float rating = [currentRemote currentSongRating]; + rating += 0.2; + if (rating > 1.0) { + rating = 1.0; + } + [currentRemote setCurrentSongRating:rating]; + + //Show rating status window + [statusWindowController showRatingWindowWithLevel:rating]; +} + +- (void)decrementRating +{ + float rating = [currentRemote currentSongRating]; + rating -= 0.2; + if (rating < 0.0) { + rating = 0.0; + } + [currentRemote setCurrentSongRating:rating]; + + //Show rating status window + [statusWindowController showRatingWindowWithLevel:rating]; +} + +- (void)toggleLoop +{ + ITMTRemotePlayerRepeatMode repeatMode = [currentRemote repeatMode]; + + switch (repeatMode) { + case ITMTRemotePlayerRepeatOff: + repeatMode = ITMTRemotePlayerRepeatAll; + break; + case ITMTRemotePlayerRepeatAll: + repeatMode = ITMTRemotePlayerRepeatOne; + break; + case ITMTRemotePlayerRepeatOne: + repeatMode = ITMTRemotePlayerRepeatOff; + break; } + [currentRemote setRepeatMode:repeatMode]; + + //Show loop status window + [statusWindowController showLoopWindowWithMode:repeatMode]; +} + +- (void)toggleShuffle +{ + bool newShuffleEnabled = ![currentRemote shuffleEnabled]; + [currentRemote setShuffleEnabled:newShuffleEnabled]; + //Show shuffle status window + [statusWindowController showLoopWindowWithMode:newShuffleEnabled]; } /*************************************************************************/ @@ -445,7 +543,15 @@ static MainController *sharedController; - (void)applicationLaunched:(NSNotification *)note { if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) { - [NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil]; + [currentRemote begin]; + [self setLatestSongIdentifier:@""]; + [self timerUpdate]; + refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:0.5 + target:self + selector:@selector(timerUpdate) + userInfo:nil + repeats:YES] retain]; + //[NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil]; [self setupHotKeys]; playerRunningState = ITMTRemotePlayerRunning; } @@ -454,18 +560,12 @@ static MainController *sharedController; - (void)applicationTerminated:(NSNotification *)note { 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:@""]; - [notRunningMenu addItem:[NSMenuItem separatorItem]]; - [notRunningMenu addItemWithTitle:@"Preferences" action:@selector(showPreferences:) keyEquivalent:@""]; - [notRunningMenu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""]; -*/ - [refreshTimer invalidate]; - [refreshTimer release]; - refreshTimer = nil; - [self clearHotKeys]; - playerRunningState = ITMTRemotePlayerNotRunning; + [currentRemote halt]; + [refreshTimer invalidate]; + [refreshTimer release]; + refreshTimer = nil; + [self clearHotKeys]; + playerRunningState = ITMTRemotePlayerNotRunning; } } @@ -489,13 +589,7 @@ static MainController *sharedController; - (void)dealloc { - if (refreshTimer) { - [refreshTimer invalidate]; - [refreshTimer release]; - refreshTimer = nil; - } - - [currentRemote halt]; + [self applicationTerminated:nil]; [statusItem release]; [statusWindowController release]; [menuController release];