#import "MenuController.h"
#import "PreferencesController.h"
#import <ITKit/ITHotKeyCenter.h>
+#import <ITKit/ITHotKey.h>
+#import <ITKit/ITKeyCombo.h>
#import "StatusWindowController.h"
#import "StatusItemHack.h"
sharedController = self;
remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
- statusWindowController = [[StatusWindowController alloc] init];
+ statusWindowController = [StatusWindowController sharedController];
menuController = [[MenuController alloc] init];
df = [[NSUserDefaults standardUserDefaults] retain];
}
- (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];
[self applicationLaunched:nil];
} else {
if ([df boolForKey:@"LaunchPlayerWithMT"])
- {
[self showPlayer];
- }
else
- {
[self applicationTerminated:nil];
- }
}
- [statusItem setImage:[NSImage imageNamed:@"menu"]];
- [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]];
+ [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];
if ([remoteClass conformsToProtocol:@protocol(ITMTRemote)] &&
[remoteClass isKindOfClass:[NSObject class]]) {
-
id remote = [remoteClass remote];
+ ITDebugLog(@"Adding remote at path %@", bundlePath);
[remoteArray addObject:remote];
}
}
#pragma mark INSTANCE METHODS
/*************************************************************************/
-- (void)startTimerInNewThread
+/*- (void)startTimerInNewThread
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
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
{
- return ( ! ([[currentRemote currentSongUniqueIdentifier] isEqualToString:@"0-0"]) );
+ return ( ! ([[currentRemote playerStateUniqueIdentifier] isEqualToString:@"0-0"]) );
}
- (BOOL)radioIsPlaying
- (BOOL)songChanged
{
- return ( ! [[currentRemote currentSongUniqueIdentifier] isEqualToString:_latestSongIdentifier] );
+ return ( ! [[currentRemote playerStateUniqueIdentifier] isEqualToString:_latestSongIdentifier] );
}
- (NSString *)latestSongIdentifier
- (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 currentSongUniqueIdentifier]];
+ if ( [self songChanged] ) {
+ ITDebugLog(@"The song changed.");
+ [self setLatestSongIdentifier:[currentRemote playerStateUniqueIdentifier]];
latestPlaylistClass = [currentRemote currentPlaylistClass];
[menuController rebuildSubmenus];
-
+
if ( [df boolForKey:@"showSongInfoOnChange"] ) {
- [self showCurrentTrackInfo];
+ [self performSelector:@selector(showCurrentTrackInfo) withObject:nil afterDelay:0.0];
}
}
}
- (void)menuClicked
{
+ ITDebugLog(@"Menu clicked.");
if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) {
[statusItem setMenu:[menuController menu]];
} else {
- (void)playPause
{
ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState];
-
+ ITDebugLog(@"Play/Pause toggled");
if (state == ITMTRemotePlayerPlaying) {
[currentRemote pause];
} else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) {
} 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];
}
- (void)closePreferences
{
+ ITDebugLog(@"Preferences closed.");
if ( ( playerRunningState == ITMTRemotePlayerRunning) ) {
[self setupHotKeys];
}
- (void)clearHotKeys
{
- [[ITHotKeyCenter sharedCenter] removeHotKey:@"PlayPause"];
- [[ITHotKeyCenter sharedCenter] removeHotKey:@"NextTrack"];
- [[ITHotKeyCenter sharedCenter] removeHotKey:@"PrevTrack"];
- [[ITHotKeyCenter sharedCenter] removeHotKey:@"TrackInfo"];
- [[ITHotKeyCenter sharedCenter] removeHotKey:@"ShowPlayer"];
- [[ITHotKeyCenter sharedCenter] removeHotKey:@"UpcomingSongs"];
- [[ITHotKeyCenter sharedCenter] removeHotKey:@"ToggleLoop"];
- [[ITHotKeyCenter sharedCenter] removeHotKey:@"ToggleShuffle"];
- [[ITHotKeyCenter sharedCenter] removeHotKey:@"IncrementVolume"];
- [[ITHotKeyCenter sharedCenter] removeHotKey:@"DecrementVolume"];
- [[ITHotKeyCenter sharedCenter] removeHotKey:@"IncrementRating"];
- [[ITHotKeyCenter sharedCenter] removeHotKey:@"DecrementRating"];
+ 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) {
- [[ITHotKeyCenter sharedCenter] addHotKey:@"PlayPause"
- combo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PlayPause"]]
- target:self action:@selector(playPause)];
+ ITDebugLog(@"Setting up play pause hot key.");
+ 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) {
- [[ITHotKeyCenter sharedCenter] addHotKey:@"NextTrack"
- combo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"NextTrack"]]
- target:self action:@selector(nextSong)];
+ ITDebugLog(@"Setting up next track hot key.");
+ 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) {
- [[ITHotKeyCenter sharedCenter] addHotKey:@"PrevTrack"
- combo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PrevTrack"]]
- target:self action:@selector(prevSong)];
+ ITDebugLog(@"Setting up previous track hot key.");
+ 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) {
- [[ITHotKeyCenter sharedCenter] addHotKey:@"ShowPlayer"
- combo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]]
- target:self action:@selector(showPlayer)];
+ ITDebugLog(@"Setting up show player hot key.");
+ 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) {
- [[ITHotKeyCenter sharedCenter] addHotKey:@"TrackInfo"
- combo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]]
- target:self action:@selector(showCurrentTrackInfo)];
+ ITDebugLog(@"Setting up track info hot key.");
+ 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) {
- [[ITHotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs"
- combo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"UpcomingSongs"]]
- target:self action:@selector(showUpcomingSongs)];
+ ITDebugLog(@"Setting up upcoming songs hot key.");
+ 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) {
- [[ITHotKeyCenter sharedCenter] addHotKey:@"ToggleLoop"
- combo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleLoop"]]
- target:self action:@selector(toggleLoop)];
+ ITDebugLog(@"Setting up toggle loop hot key.");
+ 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) {
- [[ITHotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle"
- combo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShuffle"]]
- target:self action:@selector(toggleShuffle)];
+ ITDebugLog(@"Setting up toggle shuffle hot key.");
+ 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) {
- [[ITHotKeyCenter sharedCenter] addHotKey:@"IncrementVolume"
- combo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementVolume"]]
- target:self action:@selector(incrementVolume)];
+ ITDebugLog(@"Setting up increment volume hot key.");
+ 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) {
- [[ITHotKeyCenter sharedCenter] addHotKey:@"DecrementVolume"
- combo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementVolume"]]
- target:self action:@selector(decrementVolume)];
+ ITDebugLog(@"Setting up decrement volume hot key.");
+ 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) {
- [[ITHotKeyCenter sharedCenter] addHotKey:@"IncrementRating"
- combo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementRating"]]
- target:self action:@selector(incrementRating)];
+ ITDebugLog(@"Setting up increment rating hot key.");
+ 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) {
- [[ITHotKeyCenter sharedCenter] addHotKey:@"DecrementRating"
- combo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementRating"]]
- target:self action:@selector(decrementRating)];
+ ITDebugLog(@"Setting up decrement rating hot key.");
+ 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]];
}
+ ITDebugLog(@"Finished setting up hot keys.");
}
- (void)showCurrentTrackInfo
{
- NSString *title = [currentRemote currentSongTitle];
-
+ ITMTRemotePlayerSource source = [currentRemote currentSource];
+ NSString *title = [currentRemote currentSongTitle];
+ NSString *album = nil;
+ NSString *artist = nil;
+ NSString *time = nil;
+ NSString *track = nil;
+ int rating = -1;
+
+ ITDebugLog(@"Showing track info status window.");
+
if ( title ) {
- NSString *album = nil;
- NSString *artist = nil;
- NSString *time = nil;
- int trackNumber = 0;
- int trackTotal = 0;
- int rating = 0;
if ( [df boolForKey:@"showAlbum"] ) {
album = [currentRemote currentSongAlbum];
}
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 );
}
-
- [statusWindowController showSongWindowWithTitle:title
- album:album
- artist:artist
- time:time
- trackNumber:trackNumber
- trackTotal:trackTotal
- rating:rating];
+
} else {
title = NSLocalizedString(@"noSongPlaying", @"No song is playing.");
- [statusWindowController showSongWindowWithTitle:title
- album:nil
- artist:nil
- time:nil
- trackNumber:0
- trackTotal:0
- rating:0];
}
+
+ [statusWindowController showSongInfoWindowWithSource:source
+ title:title
+ album:album
+ artist:artist
+ time:time
+ track:track
+ rating:rating];
}
- (void)showUpcomingSongs
{
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"];
}
}
- [statusWindowController showUpcomingSongsWithTitles:songList];
+ [statusWindowController showUpcomingSongsWindowWithTitles:songList];
} else {
- [statusWindowController showUpcomingSongsWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];
+ [statusWindowController showUpcomingSongsWindowWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];
}
}
- (void)incrementVolume
{
- float volume = [currentRemote volume];
- volume += 0.2;
+ float volume = [currentRemote volume];
+ float dispVol = volume;
+ ITDebugLog(@"Incrementing volume.");
+ volume += 0.110;
+ dispVol += 0.100;
+
if (volume > 1.0) {
- volume = 1.0;
+ volume = 1.0;
+ dispVol = 1.0;
}
+
+ ITDebugLog(@"Setting volume to %f", volume);
[currentRemote setVolume:volume];
-
- //Show volume status window
- [statusWindowController showVolumeWindowWithLevel:volume];
+
+ // Show volume status window
+ [statusWindowController showVolumeWindowWithLevel:dispVol];
}
- (void)decrementVolume
{
- float volume = [currentRemote volume];
- volume -= 0.2;
+ float volume = [currentRemote volume];
+ float dispVol = volume;
+ ITDebugLog(@"Decrementing volume.");
+ volume -= 0.090;
+ dispVol -= 0.100;
+
if (volume < 0.0) {
- volume = 0.0;
+ volume = 0.0;
+ dispVol = 0.0;
}
+
+ ITDebugLog(@"Setting volume to %f", volume);
[currentRemote setVolume:volume];
//Show volume status window
- [statusWindowController showVolumeWindowWithLevel:volume];
+ [statusWindowController showVolumeWindowWithLevel:dispVol];
}
- (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
- [statusWindowController showRatingWindowWithLevel:rating];
+ [statusWindowController showRatingWindowWithRating:rating];
}
- (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
- [statusWindowController showRatingWindowWithLevel:rating];
+ [statusWindowController showRatingWindowWithRating:rating];
}
- (void)toggleLoop
{
ITMTRemotePlayerRepeatMode repeatMode = [currentRemote repeatMode];
-
+ ITDebugLog(@"Toggling repeat mode.");
switch (repeatMode) {
case ITMTRemotePlayerRepeatOff:
repeatMode = ITMTRemotePlayerRepeatAll;
repeatMode = ITMTRemotePlayerRepeatOff;
break;
}
+ ITDebugLog(@"Setting repeat mode to %i", repeatMode);
[currentRemote setRepeatMode:repeatMode];
//Show loop status window
- [statusWindowController showLoopWindowWithMode:repeatMode];
+ [statusWindowController showRepeatWindowWithMode:repeatMode];
}
- (void)toggleShuffle
{
- bool newShuffleEnabled = ![currentRemote shuffleEnabled];
+ BOOL newShuffleEnabled = ( ! [currentRemote shuffleEnabled] );
+ ITDebugLog(@"Toggling shuffle mode.");
[currentRemote setShuffleEnabled:newShuffleEnabled];
//Show shuffle status window
- [statusWindowController showLoopWindowWithMode:newShuffleEnabled];
+ ITDebugLog(@"Setting shuffle mode to %i", newShuffleEnabled);
+ [statusWindowController showShuffleWindow:newShuffleEnabled];
}
/*************************************************************************/
- (void)applicationLaunched:(NSNotification *)note
{
if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
+ ITDebugLog(@"Remote application launched.");
[currentRemote begin];
[self setLatestSongIdentifier:@""];
[self timerUpdate];
- (void)applicationTerminated:(NSNotification *)note
{
if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
+ ITDebugLog(@"Remote application terminated.");
[currentRemote halt];
[refreshTimer invalidate];
[refreshTimer release];
- (void)dealloc
{
[self applicationTerminated:nil];
+ [bling release];
[statusItem release];
[statusWindowController release];
[menuController release];
git.ithinksw.org / MenuTunes.git / blobdiff