X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/5b82496caef98719afa343cba1a708b77eeaf2c0..3a1a21d1ea3e060f88ca1d24ea881f3ccb97640c:/MainController.m diff --git a/MainController.m b/MainController.m index ec906a3..523936c 100755 --- a/MainController.m +++ b/MainController.m @@ -36,7 +36,7 @@ static MainController *sharedController; sharedController = self; remoteArray = [[NSMutableArray alloc] initWithCapacity:1]; - statusWindowController = [[StatusWindowController alloc] init]; + statusWindowController = [StatusWindowController sharedController]; menuController = [[MenuController alloc] init]; df = [[NSUserDefaults standardUserDefaults] retain]; } @@ -45,6 +45,14 @@ static MainController *sharedController; - (void)applicationDidFinishLaunching:(NSNotification *)note { + //Turn on debug mode if needed + if ([df boolForKey:@"ITDebugMode"]) { + SetITDebugMode(YES); + } + + bling = [[MTBlingController alloc] init]; + blingDate = nil; + currentRemote = [self loadRemote]; [currentRemote begin]; @@ -74,23 +82,21 @@ static MainController *sharedController; [self applicationLaunched:nil]; } else { if ([df boolForKey:@"LaunchPlayerWithMT"]) - { [self showPlayer]; - } else - { [self applicationTerminated:nil]; - } } [statusItem setImage:[NSImage imageNamed:@"MenuNormal"]]; [statusItem setAlternateImage:[NSImage imageNamed:@"MenuInverted"]]; + + [NSApp deactivate]; } - (ITMTRemote *)loadRemote { NSString *folderPath = [[NSBundle mainBundle] builtInPlugInsPath]; - + ITDebugLog(@"Gathering remotes."); if (folderPath) { NSArray *bundlePathList = [NSBundle pathsForResourcesOfType:@"remote" inDirectory:folderPath]; NSEnumerator *enumerator = [bundlePathList objectEnumerator]; @@ -104,8 +110,8 @@ static MainController *sharedController; if ([remoteClass conformsToProtocol:@protocol(ITMTRemote)] && [remoteClass isKindOfClass:[NSObject class]]) { - id remote = [remoteClass remote]; + ITDebugLog(@"Adding remote at path %@", bundlePath); [remoteArray addObject:remote]; } } @@ -127,7 +133,7 @@ static MainController *sharedController; #pragma mark INSTANCE METHODS /*************************************************************************/ -- (void)startTimerInNewThread +/*- (void)startTimerInNewThread { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSRunLoop *runLoop = [NSRunLoop currentRunLoop]; @@ -137,7 +143,34 @@ static MainController *sharedController; userInfo:nil repeats:YES] retain]; [runLoop run]; + ITDebugLog(@"Timer started."); [pool release]; +}*/ + +- (void)blingTime +{ + NSDate *now = [NSDate date]; + if ( (! blingDate) || ([now timeIntervalSinceDate:blingDate] >= 86400) ) { + [bling showPanelIfNeeded]; + [blingDate autorelease]; + blingDate = [now retain]; + } +} + +- (void)blingNow +{ + [bling showPanel]; + [blingDate autorelease]; + blingDate = [[NSDate date] retain]; +} + +- (BOOL)blingBling +{ + if ( ! ([bling checkDone] == 2475) ) { + return NO; + } else { + return YES; + } } - (BOOL)songIsPlaying @@ -162,30 +195,28 @@ static MainController *sharedController; - (void)setLatestSongIdentifier:(NSString *)newIdentifier { + ITDebugLog(@"Setting latest song identifier to %@", newIdentifier); [_latestSongIdentifier autorelease]; _latestSongIdentifier = [newIdentifier copy]; } - (void)timerUpdate { - //This huge if statement is being nasty - /*if ( ( [self songChanged] ) || - ( ([self radioIsPlaying]) && (latestPlaylistClass != ITMTRemotePlayerRadioPlaylist) ) || - ( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) )*/ - if ( [self songChanged] ) { + ITDebugLog(@"The song changed."); [self setLatestSongIdentifier:[currentRemote playerStateUniqueIdentifier]]; latestPlaylistClass = [currentRemote currentPlaylistClass]; [menuController rebuildSubmenus]; if ( [df boolForKey:@"showSongInfoOnChange"] ) { -// [self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0]; + [self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0]; } } } - (void)menuClicked { + ITDebugLog(@"Menu clicked."); if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) { [statusItem setMenu:[menuController menu]]; } else { @@ -202,7 +233,7 @@ static MainController *sharedController; - (void)playPause { ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState]; - + ITDebugLog(@"Play/Pause toggled"); if (state == ITMTRemotePlayerPlaying) { [currentRemote pause]; } else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) { @@ -211,85 +242,90 @@ static MainController *sharedController; } else { [currentRemote play]; } - [self timerUpdate]; } - (void)nextSong { + ITDebugLog(@"Going to next song."); [currentRemote goToNextSong]; - [self timerUpdate]; } - (void)prevSong { + ITDebugLog(@"Going to previous song."); [currentRemote goToPreviousSong]; - [self timerUpdate]; } - (void)fastForward { + ITDebugLog(@"Fast forwarding."); [currentRemote forward]; - [self timerUpdate]; } - (void)rewind { + ITDebugLog(@"Rewinding."); [currentRemote rewind]; - [self timerUpdate]; } - (void)selectPlaylistAtIndex:(int)index { + ITDebugLog(@"Selecting playlist %i", index); [currentRemote switchToPlaylistAtIndex:index]; - [self timerUpdate]; } - (void)selectSongAtIndex:(int)index { + ITDebugLog(@"Selecting song %i", index); [currentRemote switchToSongAtIndex:index]; - [self timerUpdate]; } - (void)selectSongRating:(int)rating { + ITDebugLog(@"Selecting song rating %i", rating); [currentRemote setCurrentSongRating:(float)rating / 100.0]; - [self timerUpdate]; } - (void)selectEQPresetAtIndex:(int)index { + ITDebugLog(@"Selecting EQ preset %i", index); [currentRemote switchToEQAtIndex:index]; - [self timerUpdate]; } - (void)showPlayer { + ITDebugLog(@"Beginning show player."); if ( ( playerRunningState == ITMTRemotePlayerRunning) ) { + ITDebugLog(@"Showing player interface."); [currentRemote showPrimaryInterface]; } else { + ITDebugLog(@"Launching player."); if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) { - NSLog(@"MenuTunes: Error Launching Player"); + ITDebugLog(@"Error Launching Player"); } } + ITDebugLog(@"Finished show player."); } - (void)showPreferences { + ITDebugLog(@"Show preferences."); [[PreferencesController sharedPrefs] setController:self]; [[PreferencesController sharedPrefs] showPrefsWindow:self]; } - (void)quitMenuTunes { + ITDebugLog(@"Quitting MenuTunes."); [NSApp terminate:self]; } @@ -298,6 +334,7 @@ static MainController *sharedController; - (void)closePreferences { + ITDebugLog(@"Preferences closed."); if ( ( playerRunningState == ITMTRemotePlayerRunning) ) { [self setupHotKeys]; } @@ -318,17 +355,19 @@ static MainController *sharedController; { NSEnumerator *hotKeyEnumerator = [[[ITHotKeyCenter sharedCenter] allHotKeys] objectEnumerator]; ITHotKey *nextHotKey; - + ITDebugLog(@"Clearing hot keys."); while ( (nextHotKey = [hotKeyEnumerator nextObject]) ) { [[ITHotKeyCenter sharedCenter] unregisterHotKey:nextHotKey]; } + ITDebugLog(@"Done clearing hot keys."); } - (void)setupHotKeys { ITHotKey *hotKey; - + ITDebugLog(@"Setting up hot keys."); if ([df objectForKey:@"PlayPause"] != nil) { + ITDebugLog(@"Setting up play pause hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"PlayPause"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PlayPause"]]]; @@ -338,6 +377,7 @@ static MainController *sharedController; } if ([df objectForKey:@"NextTrack"] != nil) { + ITDebugLog(@"Setting up next track hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"NextTrack"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"NextTrack"]]]; @@ -347,6 +387,7 @@ static MainController *sharedController; } if ([df objectForKey:@"PrevTrack"] != nil) { + ITDebugLog(@"Setting up previous track hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"PrevTrack"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PrevTrack"]]]; @@ -356,6 +397,7 @@ static MainController *sharedController; } if ([df objectForKey:@"ShowPlayer"] != nil) { + ITDebugLog(@"Setting up show player hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"ShowPlayer"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]]]; @@ -365,6 +407,7 @@ static MainController *sharedController; } if ([df objectForKey:@"TrackInfo"] != nil) { + ITDebugLog(@"Setting up track info hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"TrackInfo"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]]]; @@ -374,6 +417,7 @@ static MainController *sharedController; } if ([df objectForKey:@"UpcomingSongs"] != nil) { + ITDebugLog(@"Setting up upcoming songs hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"UpcomingSongs"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"UpcomingSongs"]]]; @@ -383,6 +427,7 @@ static MainController *sharedController; } if ([df objectForKey:@"ToggleLoop"] != nil) { + ITDebugLog(@"Setting up toggle loop hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"ToggleLoop"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleLoop"]]]; @@ -392,6 +437,7 @@ static MainController *sharedController; } if ([df objectForKey:@"ToggleShuffle"] != nil) { + ITDebugLog(@"Setting up toggle shuffle hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"ToggleShuffle"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShuffle"]]]; @@ -401,6 +447,7 @@ static MainController *sharedController; } if ([df objectForKey:@"IncrementVolume"] != nil) { + ITDebugLog(@"Setting up increment volume hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"IncrementVolume"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementVolume"]]]; @@ -410,6 +457,7 @@ static MainController *sharedController; } if ([df objectForKey:@"DecrementVolume"] != nil) { + ITDebugLog(@"Setting up decrement volume hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"DecrementVolume"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementVolume"]]]; @@ -419,6 +467,7 @@ static MainController *sharedController; } if ([df objectForKey:@"IncrementRating"] != nil) { + ITDebugLog(@"Setting up increment rating hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"IncrementRating"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementRating"]]]; @@ -428,6 +477,7 @@ static MainController *sharedController; } if ([df objectForKey:@"DecrementRating"] != nil) { + ITDebugLog(@"Setting up decrement rating hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"DecrementRating"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementRating"]]]; @@ -435,6 +485,7 @@ static MainController *sharedController; [hotKey setAction:@selector(decrementRating)]; [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]]; } + ITDebugLog(@"Finished setting up hot keys."); } - (void)showCurrentTrackInfo @@ -444,10 +495,11 @@ static MainController *sharedController; NSString *album = nil; NSString *artist = nil; NSString *time = nil; - int trackNumber = 0; - int trackTotal = 0; + NSString *track = nil; int rating = -1; + ITDebugLog(@"Showing track info status window."); + if ( title ) { if ( [df boolForKey:@"showAlbum"] ) { @@ -459,15 +511,23 @@ static MainController *sharedController; } if ( [df boolForKey:@"showTime"] ) { - time = [currentRemote currentSongLength]; + time = [NSString stringWithFormat:@"%@: %@ / %@", + @"Time", + [currentRemote currentSongElapsed], + [currentRemote currentSongLength]]; } - if ( [df boolForKey:@"showNumber"] ) { - trackNumber = [currentRemote currentSongTrack]; - trackTotal = [currentRemote currentAlbumTrackCount]; + if ( [df boolForKey:@"showTrackNumber"] ) { + int trackNo = [currentRemote currentSongTrack]; + int trackCount = [currentRemote currentAlbumTrackCount]; + + if ( (trackNo > 0) || (trackCount > 0) ) { + track = [NSString stringWithFormat:@"%@: %i %@ %i", + @"Track", trackNo, @"of", trackCount]; + } } - if ( [df boolForKey:@"showRating"] ) { + if ( [df boolForKey:@"showTrackRating"] ) { rating = ( [currentRemote currentSongRating] * 5 ); } @@ -480,8 +540,7 @@ static MainController *sharedController; album:album artist:artist time:time - trackNumber:trackNumber - trackTotal:trackTotal + track:track rating:rating]; } @@ -489,7 +548,7 @@ static MainController *sharedController; { int curPlaylist = [currentRemote currentPlaylistIndex]; int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curPlaylist]; - + ITDebugLog(@"Showing upcoming songs status window."); if (numSongs > 0) { NSMutableArray *songList = [NSMutableArray arrayWithCapacity:5]; int numSongsInAdvance = [df integerForKey:@"SongsInAdvance"]; @@ -513,7 +572,7 @@ static MainController *sharedController; { float volume = [currentRemote volume]; float dispVol = volume; - + ITDebugLog(@"Incrementing volume."); volume += 0.110; dispVol += 0.100; @@ -522,9 +581,10 @@ static MainController *sharedController; dispVol = 1.0; } + ITDebugLog(@"Setting volume to %f", volume); [currentRemote setVolume:volume]; - // Show volume status window + // Show volume status window [statusWindowController showVolumeWindowWithLevel:dispVol]; } @@ -532,7 +592,7 @@ static MainController *sharedController; { float volume = [currentRemote volume]; float dispVol = volume; - + ITDebugLog(@"Decrementing volume."); volume -= 0.090; dispVol -= 0.100; @@ -541,6 +601,7 @@ static MainController *sharedController; dispVol = 0.0; } + ITDebugLog(@"Setting volume to %f", volume); [currentRemote setVolume:volume]; //Show volume status window @@ -550,10 +611,12 @@ static MainController *sharedController; - (void)incrementRating { float rating = [currentRemote currentSongRating]; + ITDebugLog(@"Incrementing rating."); rating += 0.2; if (rating > 1.0) { rating = 1.0; } + ITDebugLog(@"Setting rating to %f", rating); [currentRemote setCurrentSongRating:rating]; //Show rating status window @@ -563,10 +626,12 @@ static MainController *sharedController; - (void)decrementRating { float rating = [currentRemote currentSongRating]; + ITDebugLog(@"Decrementing rating."); rating -= 0.2; if (rating < 0.0) { rating = 0.0; } + ITDebugLog(@"Setting rating to %f", rating); [currentRemote setCurrentSongRating:rating]; //Show rating status window @@ -576,6 +641,7 @@ static MainController *sharedController; - (void)toggleLoop { ITMTRemotePlayerRepeatMode repeatMode = [currentRemote repeatMode]; + ITDebugLog(@"Toggling repeat mode."); switch (repeatMode) { case ITMTRemotePlayerRepeatOff: repeatMode = ITMTRemotePlayerRepeatAll; @@ -587,6 +653,7 @@ static MainController *sharedController; repeatMode = ITMTRemotePlayerRepeatOff; break; } + ITDebugLog(@"Setting repeat mode to %i", repeatMode); [currentRemote setRepeatMode:repeatMode]; //Show loop status window @@ -595,10 +662,12 @@ static MainController *sharedController; - (void)toggleShuffle { - bool newShuffleEnabled = ![currentRemote shuffleEnabled]; + BOOL newShuffleEnabled = ( ! [currentRemote shuffleEnabled] ); + ITDebugLog(@"Toggling shuffle mode."); [currentRemote setShuffleEnabled:newShuffleEnabled]; //Show shuffle status window - [statusWindowController showRepeatWindowWithMode:newShuffleEnabled]; + ITDebugLog(@"Setting shuffle mode to %i", newShuffleEnabled); + [statusWindowController showShuffleWindow:newShuffleEnabled]; } /*************************************************************************/ @@ -609,6 +678,7 @@ static MainController *sharedController; - (void)applicationLaunched:(NSNotification *)note { if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) { + ITDebugLog(@"Remote application launched."); [currentRemote begin]; [self setLatestSongIdentifier:@""]; [self timerUpdate]; @@ -626,6 +696,7 @@ static MainController *sharedController; - (void)applicationTerminated:(NSNotification *)note { if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) { + ITDebugLog(@"Remote application terminated."); [currentRemote halt]; [refreshTimer invalidate]; [refreshTimer release]; @@ -656,6 +727,7 @@ static MainController *sharedController; - (void)dealloc { [self applicationTerminated:nil]; + [bling release]; [statusItem release]; [statusWindowController release]; [menuController release];