X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/6b9ab466464daf5ae2427e67d20c368583bb0568..97a58d16b59657d99b396a9d7e3ef2eadb357fa8:/MainController.m?ds=sidebyside diff --git a/MainController.m b/MainController.m index f0ee9ad..681da56 100755 --- a/MainController.m +++ b/MainController.m @@ -1,16 +1,30 @@ -#import "NewMainController.h" +#import "MainController.h" +#import "MenuController.h" #import "PreferencesController.h" -#import "HotKeyCenter.h" +#import +#import +#import #import "StatusWindowController.h" +#import "StatusItemHack.h" @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; + @implementation MainController ++ (MainController *)sharedController +{ + return sharedController; +} + /*************************************************************************/ #pragma mark - #pragma mark INITIALIZATION/DEALLOCATION METHODS @@ -19,10 +33,12 @@ - (id)init { if ( ( self = [super init] ) ) { + sharedController = self; + remoteArray = [[NSMutableArray alloc] initWithCapacity:1]; statusWindowController = [[StatusWindowController alloc] init]; + menuController = [[MenuController alloc] init]; df = [[NSUserDefaults standardUserDefaults] retain]; - [self setLatestSongIdentifier:@"0-0"]; } return self; } @@ -44,17 +60,31 @@ selector:@selector(applicationLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil]; - + if ( ! [df objectForKey:@"menu"] ) { // If this is nil, defaults have never been registered. [[PreferencesController sharedPrefs] registerDefaults]; } + [StatusItemHack install]; statusItem = [[ITStatusItem alloc] initWithStatusBar:[NSStatusBar systemStatusBar] withLength:NSSquareStatusItemLength]; - [statusItem setImage:[NSImage imageNamed:@"menu"]]; - [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]]; + if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) { + [self applicationLaunched:nil]; + } else { + if ([df boolForKey:@"LaunchPlayerWithMT"]) + { + [self showPlayer]; + } + else + { + [self applicationTerminated:nil]; + } + } + + [statusItem setImage:[NSImage imageNamed:@"MenuNormal"]]; + [statusItem setAlternateImage:[NSImage imageNamed:@"MenuInverted"]]; } - (ITMTRemote *)loadRemote @@ -112,7 +142,7 @@ - (BOOL)songIsPlaying { - return ( ! ([[currentRemote currentSongUniqueIdentifier] isEqualToString:@"0-0"]) ); + return ( ! ([[currentRemote playerStateUniqueIdentifier] isEqualToString:@"0-0"]) ); } - (BOOL)radioIsPlaying @@ -122,7 +152,7 @@ - (BOOL)songChanged { - return ( ! [[currentRemote currentSongUniqueIdentifier] isEqualToString:_latestSongIdentifier] ); + return ( ! [[currentRemote playerStateUniqueIdentifier] isEqualToString:_latestSongIdentifier] ); } - (NSString *)latestSongIdentifier @@ -138,131 +168,116 @@ - (void)timerUpdate { - if ( ( [self songChanged] ) || + //This huge if statement is being nasty + /*if ( ( [self songChanged] ) || ( ([self radioIsPlaying]) && (latestPlaylistClass != ITMTRemotePlayerRadioPlaylist) ) || - ( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) ) { - //[statusItem setMenu:[self menu]]; - [self setLatestSongIdentifier:[currentRemote currentSongUniqueIdentifier]]; + ( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) )*/ + + if ([self songChanged]) { + [self setLatestSongIdentifier:[currentRemote playerStateUniqueIdentifier]]; latestPlaylistClass = [currentRemote currentPlaylistClass]; - + [menuController rebuildSubmenus]; + if ( [df boolForKey:@"showSongInfoOnChange"] ) { [self showCurrentTrackInfo]; } } -/* - //Update Play/Pause menu item - if (playPauseItem){ - if ([currentRemote playerPlayingState] == ITMTRemotePlayerPlaying) { - [playPauseItem setTitle:@"Pause"]; - } else { - [playPauseItem setTitle:@"Play"]; - } +} + +- (void)menuClicked +{ + if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) { + [statusItem setMenu:[menuController menu]]; + } else { + [statusItem setMenu:[menuController menuForNoPlayer]]; } -*/ } -/* // // // Menu Selectors // // -- (void)selectSong:(id)sender -{ - [currentRemote switchToSongAtIndex:[[sender representedObject] intValue]]; -} -*/ -- (void)selectPlaylist:(id)sender -{ - int playlist = [sender tag]; - [currentRemote switchToPlaylistAtIndex:playlist]; -} -/* -- (void)selectEQPreset:(id)sender -{ - int curSet = [currentRemote currentEQPresetIndex]; - int item = [sender tag]; - - [currentRemote switchToEQAtIndex:item]; - [[eqMenu itemAtIndex:curSet - 1] setState:NSOffState]; - [[eqMenu itemAtIndex:item] setState:NSOnState]; -} -*/ -/* -- (void)selectSongRating:(id)sender -{ - 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)playPause { ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState]; if (state == ITMTRemotePlayerPlaying) { [currentRemote pause]; - [playPauseItem setTitle:@"Play"]; } else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) { [currentRemote pause]; [currentRemote play]; } else { [currentRemote play]; - [playPauseItem setTitle:@"Pause"]; } } -- (void)nextSong:(id)sender +- (void)nextSong { [currentRemote goToNextSong]; } -- (void)prevSong:(id)sender +- (void)prevSong { [currentRemote goToPreviousSong]; } -- (void)fastForward:(id)sender +- (void)fastForward { [currentRemote forward]; - [playPauseItem setTitle:@"Play"]; } -- (void)rewind:(id)sender +- (void)rewind { [currentRemote rewind]; - [playPauseItem setTitle:@"Play"]; } -*/ -// -// -- (void)quitMenuTunes:(id)sender +- (void)selectPlaylistAtIndex:(int)index { - [NSApp terminate:self]; + [currentRemote switchToPlaylistAtIndex:index]; +} + +- (void)selectSongAtIndex:(int)index +{ + [currentRemote switchToSongAtIndex:index]; +} + +- (void)selectSongRating:(int)rating +{ + [currentRemote setCurrentSongRating:(float)rating / 100.0]; +} + +- (void)selectEQPresetAtIndex:(int)index +{ + [currentRemote switchToEQAtIndex:index]; } -- (void)showPlayer:(id)sender +- (void)showPlayer { if ( ( playerRunningState == ITMTRemotePlayerRunning) ) { [currentRemote showPrimaryInterface]; } else { if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) { - NSLog(@"Error Launching Player"); + NSLog(@"MenuTunes: Error Launching Player"); } } } -- (void)showPreferences:(id)sender +- (void)showPreferences { [[PreferencesController sharedPrefs] setController:self]; [[PreferencesController sharedPrefs] showPrefsWindow:self]; } +- (void)quitMenuTunes +{ + [NSApp terminate:self]; +} + +// +// + - (void)closePreferences { if ( ( playerRunningState == ITMTRemotePlayerRunning) ) { @@ -283,85 +298,124 @@ - (void)clearHotKeys { - [[HotKeyCenter sharedCenter] removeHotKey:@"PlayPause"]; - [[HotKeyCenter sharedCenter] removeHotKey:@"NextTrack"]; - [[HotKeyCenter sharedCenter] removeHotKey:@"PrevTrack"]; - [[HotKeyCenter sharedCenter] removeHotKey:@"TrackInfo"]; - [[HotKeyCenter sharedCenter] removeHotKey:@"UpcomingSongs"]; - [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleLoop"]; - [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleShuffle"]; - [[HotKeyCenter sharedCenter] removeHotKey:@"IncrementVolume"]; - [[HotKeyCenter sharedCenter] removeHotKey:@"DecrementVolume"]; - [[HotKeyCenter sharedCenter] removeHotKey:@"IncrementRating"]; - [[HotKeyCenter sharedCenter] removeHotKey:@"DecrementRating"]; + NSEnumerator *hotKeyEnumerator = [[[ITHotKeyCenter sharedCenter] allHotKeys] objectEnumerator]; + ITHotKey *nextHotKey; + + while ( (nextHotKey = [hotKeyEnumerator nextObject]) ) { + [[ITHotKeyCenter sharedCenter] unregisterHotKey:nextHotKey]; + } } - (void)setupHotKeys { + ITHotKey *hotKey; + if ([df objectForKey:@"PlayPause"] != nil) { - [[HotKeyCenter sharedCenter] addHotKey:@"PlayPause" - combo:[df keyComboForKey:@"PlayPause"] - target:self action:@selector(playPause:)]; + hotKey = [[ITHotKey alloc] init]; + [hotKey setName:@"PlayPause"]; + [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PlayPause"]]]; + [hotKey setTarget:self]; + [hotKey setAction:@selector(playPause)]; + [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]]; } if ([df objectForKey:@"NextTrack"] != nil) { - [[HotKeyCenter sharedCenter] addHotKey:@"NextTrack" - combo:[df keyComboForKey:@"NextTrack"] - target:self action:@selector(nextSong:)]; + hotKey = [[ITHotKey alloc] init]; + [hotKey setName:@"NextTrack"]; + [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"NextTrack"]]]; + [hotKey setTarget:self]; + [hotKey setAction:@selector(nextSong)]; + [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]]; } if ([df objectForKey:@"PrevTrack"] != nil) { - [[HotKeyCenter sharedCenter] addHotKey:@"PrevTrack" - combo:[df keyComboForKey:@"PrevTrack"] - target:self action:@selector(prevSong:)]; + hotKey = [[ITHotKey alloc] init]; + [hotKey setName:@"PrevTrack"]; + [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PrevTrack"]]]; + [hotKey setTarget:self]; + [hotKey setAction:@selector(prevSong)]; + [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]]; + } + + if ([df objectForKey:@"ShowPlayer"] != nil) { + hotKey = [[ITHotKey alloc] init]; + [hotKey setName:@"ShowPlayer"]; + [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]]]; + [hotKey setTarget:self]; + [hotKey setAction:@selector(showPlayer)]; + [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]]; } if ([df objectForKey:@"TrackInfo"] != nil) { - [[HotKeyCenter sharedCenter] addHotKey:@"TrackInfo" - combo:[df keyComboForKey:@"TrackInfo"] - target:self action:@selector(showCurrentTrackInfo)]; + hotKey = [[ITHotKey alloc] init]; + [hotKey setName:@"TrackInfo"]; + [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]]]; + [hotKey setTarget:self]; + [hotKey setAction:@selector(showCurrentTrackInfo)]; + [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]]; } if ([df objectForKey:@"UpcomingSongs"] != nil) { - [[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs" - combo:[df keyComboForKey:@"UpcomingSongs"] - target:self action:@selector(showUpcomingSongs)]; + hotKey = [[ITHotKey alloc] init]; + [hotKey setName:@"UpcomingSongs"]; + [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"UpcomingSongs"]]]; + [hotKey setTarget:self]; + [hotKey setAction:@selector(showUpcomingSongs)]; + [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]]; } if ([df objectForKey:@"ToggleLoop"] != nil) { - [[HotKeyCenter sharedCenter] addHotKey:@"ToggleLoop" - combo:[df keyComboForKey:@"ToggleLoop"] - target:self action:NULL/*Set this to something*/]; + hotKey = [[ITHotKey alloc] init]; + [hotKey setName:@"ToggleLoop"]; + [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleLoop"]]]; + [hotKey setTarget:self]; + [hotKey setAction:@selector(toggleLoop)]; + [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]]; } if ([df objectForKey:@"ToggleShuffle"] != nil) { - [[HotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle" - combo:[df keyComboForKey:@"ToggleShuffle"] - target:self action:NULL/*Set this to something*/]; + hotKey = [[ITHotKey alloc] init]; + [hotKey setName:@"ToggleShuffle"]; + [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShuffle"]]]; + [hotKey setTarget:self]; + [hotKey setAction:@selector(toggleShuffle)]; + [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]]; } if ([df objectForKey:@"IncrementVolume"] != nil) { - [[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume" - combo:[df keyComboForKey:@"IncrementVolume"] - target:self action:NULL/*Set this to something*/]; + hotKey = [[ITHotKey alloc] init]; + [hotKey setName:@"IncrementVolume"]; + [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementVolume"]]]; + [hotKey setTarget:self]; + [hotKey setAction:@selector(incrementVolume)]; + [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]]; } if ([df objectForKey:@"DecrementVolume"] != nil) { - [[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume" - combo:[df keyComboForKey:@"DecrementVolume"] - target:self action:NULL/*Set this to something*/]; + hotKey = [[ITHotKey alloc] init]; + [hotKey setName:@"DecrementVolume"]; + [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementVolume"]]]; + [hotKey setTarget:self]; + [hotKey setAction:@selector(decrementVolume)]; + [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]]; } if ([df objectForKey:@"IncrementRating"] != nil) { - [[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating" - combo:[df keyComboForKey:@"IncrementRating"] - target:self action:NULL/*Set this to something*/]; + hotKey = [[ITHotKey alloc] init]; + [hotKey setName:@"IncrementRating"]; + [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementRating"]]]; + [hotKey setTarget:self]; + [hotKey setAction:@selector(incrementRating)]; + [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]]; } if ([df objectForKey:@"DecrementRating"] != nil) { - [[HotKeyCenter sharedCenter] addHotKey:@"DecrementRating" - combo:[df keyComboForKey:@"DecrementRating"] - target:self action:NULL/*Set this to something*/]; + hotKey = [[ITHotKey alloc] init]; + [hotKey setName:@"DecrementRating"]; + [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementRating"]]]; + [hotKey setTarget:self]; + [hotKey setAction:@selector(decrementRating)]; + [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]]; } } @@ -370,12 +424,13 @@ NSString *title = [currentRemote currentSongTitle]; if ( title ) { - NSString *album = nil; - NSString *artist = nil; - NSString *time = nil; - int trackNumber = 0; - int trackTotal = 0; - int rating = 0; + NSString *album = nil; + NSString *artist = nil; + NSString *time = nil; + int trackNumber = 0; + int trackTotal = 0; + int rating = 0; + ITMTRemotePlayerSource source = [currentRemote currentSource]; if ( [df boolForKey:@"showAlbum"] ) { album = [currentRemote currentSongAlbum]; @@ -404,16 +459,18 @@ time:time trackNumber:trackNumber trackTotal:trackTotal - rating:rating]; + rating:rating + source:source]; } else { - title = @"No song is playing."; + title = NSLocalizedString(@"noSongPlaying", @"No song is playing."); [statusWindowController showSongWindowWithTitle:title album:nil artist:nil time:nil trackNumber:0 trackTotal:0 - rating:0]; + rating:0 + source:[currentRemote currentSource]]; } } @@ -437,8 +494,89 @@ [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]; } /*************************************************************************/ @@ -449,7 +587,15 @@ - (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; } @@ -458,20 +604,12 @@ - (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; - - [statusItem setMenu:[self menuForNoPlayer]]; + [currentRemote halt]; + [refreshTimer invalidate]; + [refreshTimer release]; + refreshTimer = nil; + [self clearHotKeys]; + playerRunningState = ITMTRemotePlayerNotRunning; } } @@ -495,17 +633,12 @@ - (void)dealloc { - if (refreshTimer) { - [refreshTimer invalidate]; - [refreshTimer release]; - refreshTimer = nil; - } - - [currentRemote halt]; + [self applicationTerminated:nil]; [statusItem release]; [statusWindowController release]; + [menuController release]; [super dealloc]; } -@end +@end \ No newline at end of file