X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/b3c2ee58062172cc83fb7ad97596769b840b76ad..875d1362ed16bfa0f85054fc7df31a4f08b9b29f:/MainController.m diff --git a/MainController.m b/MainController.m index 10a944b..09443c2 100755 --- a/MainController.m +++ b/MainController.m @@ -4,6 +4,7 @@ #import #import #import +#import "StatusWindow.h" #import "StatusWindowController.h" #import "StatusItemHack.h" @@ -36,9 +37,10 @@ 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]; + timerUpdating = NO; } return self; } @@ -75,27 +77,33 @@ static MainController *sharedController; initWithStatusBar:[NSStatusBar systemStatusBar] withLength:NSSquareStatusItemLength]; + bling = [[MTBlingController alloc] init]; + [self blingTime]; + registerTimer = [[NSTimer scheduledTimerWithTimeInterval:10.0 + target:self + selector:@selector(blingTime) + userInfo:nil + repeats:YES] retain]; + 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"]]; + + [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]; @@ -109,8 +117,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]; } } @@ -132,7 +140,7 @@ static MainController *sharedController; #pragma mark INSTANCE METHODS /*************************************************************************/ -- (void)startTimerInNewThread +/*- (void)startTimerInNewThread { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSRunLoop *runLoop = [NSRunLoop currentRunLoop]; @@ -142,7 +150,58 @@ static MainController *sharedController; userInfo:nil repeats:YES] retain]; [runLoop run]; + ITDebugLog(@"Timer started."); [pool release]; +}*/ + +- (void)setBlingTime:(NSDate*)date +{ + NSMutableDictionary *globalPrefs; + [df synchronize]; + globalPrefs = [[df persistentDomainForName:@".GlobalPreferences"] mutableCopy]; + [globalPrefs setObject:date forKey:@"ITMTTrialStart"]; + [df setPersistentDomain:globalPrefs forName:@".GlobalPreferences"]; + [df synchronize]; + [globalPrefs release]; +} + +- (NSDate*)getBlingTime +{ + [df synchronize]; + return [[df persistentDomainForName:@".GlobalPreferences"] objectForKey:@"ITMTTrialStart"]; +} + +- (void)blingTime +{ + NSDate *now = [NSDate date]; + if ( (! [self getBlingTime] ) ) { + [self setBlingTime:now]; + } + if ( ([now timeIntervalSinceDate:[self getBlingTime]] >= 604800) ) { + [statusItem setEnabled:NO]; + [self clearHotKeys]; + if ([refreshTimer isValid]) { + [refreshTimer invalidate]; + } + if ([registerTimer isValid]) { + [registerTimer invalidate]; + } + [statusWindowController showRegistrationQueryWindow]; + } +} + +- (void)blingNow +{ + [bling showPanel]; +} + +- (BOOL)blingBling +{ + if ( ! ([bling checkDone] == 2475) ) { + return NO; + } else { + return YES; + } } - (BOOL)songIsPlaying @@ -167,30 +226,32 @@ 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] ) { - [self setLatestSongIdentifier:[currentRemote playerStateUniqueIdentifier]]; + if ( [self songChanged] && (timerUpdating != YES) ) { + ITDebugLog(@"The song changed."); + timerUpdating = YES; 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]; } + + [self setLatestSongIdentifier:[currentRemote playerStateUniqueIdentifier]]; + + timerUpdating = NO; } } - (void)menuClicked { + ITDebugLog(@"Menu clicked."); if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) { [statusItem setMenu:[menuController menu]]; } else { @@ -207,7 +268,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)) { @@ -216,85 +277,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]; } @@ -303,6 +369,7 @@ static MainController *sharedController; - (void)closePreferences { + ITDebugLog(@"Preferences closed."); if ( ( playerRunningState == ITMTRemotePlayerRunning) ) { [self setupHotKeys]; } @@ -323,17 +390,24 @@ 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 (playerRunningState == ITMTRemotePlayerNotRunning) { + return; + } 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"]]]; @@ -343,6 +417,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"]]]; @@ -352,6 +427,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"]]]; @@ -361,6 +437,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"]]]; @@ -370,6 +447,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"]]]; @@ -379,6 +457,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"]]]; @@ -388,6 +467,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"]]]; @@ -397,6 +477,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"]]]; @@ -406,6 +487,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"]]]; @@ -415,6 +497,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"]]]; @@ -424,6 +507,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"]]]; @@ -433,6 +517,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"]]]; @@ -440,6 +525,7 @@ static MainController *sharedController; [hotKey setAction:@selector(decrementRating)]; [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]]; } + ITDebugLog(@"Finished setting up hot keys."); } - (void)showCurrentTrackInfo @@ -449,10 +535,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"] ) { @@ -464,16 +551,27 @@ 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"] ) { - rating = ( [currentRemote currentSongRating] * 5 ); + if ( [df boolForKey:@"showTrackRating"] ) { + float currentRating = [currentRemote currentSongRating]; + if (currentRating >= 0.0) { + rating = ( currentRating * 5 ); + } } } else { @@ -485,8 +583,7 @@ static MainController *sharedController; album:album artist:artist time:time - trackNumber:trackNumber - trackTotal:trackTotal + track:track rating:rating]; } @@ -494,7 +591,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"]; @@ -518,7 +615,7 @@ static MainController *sharedController; { float volume = [currentRemote volume]; float dispVol = volume; - + ITDebugLog(@"Incrementing volume."); volume += 0.110; dispVol += 0.100; @@ -527,9 +624,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]; } @@ -537,7 +635,7 @@ static MainController *sharedController; { float volume = [currentRemote volume]; float dispVol = volume; - + ITDebugLog(@"Decrementing volume."); volume -= 0.090; dispVol -= 0.100; @@ -546,6 +644,7 @@ static MainController *sharedController; dispVol = 0.0; } + ITDebugLog(@"Setting volume to %f", volume); [currentRemote setVolume:volume]; //Show volume status window @@ -555,10 +654,18 @@ static MainController *sharedController; - (void)incrementRating { float rating = [currentRemote currentSongRating]; + ITDebugLog(@"Incrementing rating."); + + if ([currentRemote currentPlaylistIndex] == 0) { + ITDebugLog(@"No song playing, rating change aborted."); + return; + } + rating += 0.2; if (rating > 1.0) { rating = 1.0; } + ITDebugLog(@"Setting rating to %f", rating); [currentRemote setCurrentSongRating:rating]; //Show rating status window @@ -568,10 +675,18 @@ static MainController *sharedController; - (void)decrementRating { float rating = [currentRemote currentSongRating]; + ITDebugLog(@"Decrementing rating."); + + if ([currentRemote currentPlaylistIndex] == 0) { + ITDebugLog(@"No song playing, rating change aborted."); + return; + } + rating -= 0.2; if (rating < 0.0) { rating = 0.0; } + ITDebugLog(@"Setting rating to %f", rating); [currentRemote setCurrentSongRating:rating]; //Show rating status window @@ -581,6 +696,7 @@ static MainController *sharedController; - (void)toggleLoop { ITMTRemotePlayerRepeatMode repeatMode = [currentRemote repeatMode]; + ITDebugLog(@"Toggling repeat mode."); switch (repeatMode) { case ITMTRemotePlayerRepeatOff: repeatMode = ITMTRemotePlayerRepeatAll; @@ -592,6 +708,7 @@ static MainController *sharedController; repeatMode = ITMTRemotePlayerRepeatOff; break; } + ITDebugLog(@"Setting repeat mode to %i", repeatMode); [currentRemote setRepeatMode:repeatMode]; //Show loop status window @@ -600,12 +717,33 @@ 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]; } +- (void)registerNowOK +{ + [[StatusWindow sharedWindow] setLocked:NO]; + [[StatusWindow sharedWindow] vanish:self]; + [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES]; + + [self blingNow]; +} + +- (void)registerNowCancel +{ + [[StatusWindow sharedWindow] setLocked:NO]; + [[StatusWindow sharedWindow] vanish:self]; + [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES]; + + [NSApp terminate:self]; +} + + /*************************************************************************/ #pragma mark - #pragma mark WORKSPACE NOTIFICATION HANDLERS @@ -614,6 +752,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]; @@ -631,10 +770,14 @@ 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]; refreshTimer = nil; + [registerTimer invalidate]; + [registerTimer release]; + registerTimer = nil; [self clearHotKeys]; playerRunningState = ITMTRemotePlayerNotRunning; } @@ -661,6 +804,7 @@ static MainController *sharedController; - (void)dealloc { [self applicationTerminated:nil]; + [bling release]; [statusItem release]; [statusWindowController release]; [menuController release];