X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/f875a120d9bd1c8d288aba1fa02d525cd8c4d4c9..b936ca5ffb6320a3febce6a7d0c2875b072ac6bc:/MainController.m

diff --git a/MainController.m b/MainController.m
index f501b69..ea44696 100755
--- a/MainController.m
+++ b/MainController.m
@@ -11,7 +11,6 @@
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (void)showCurrentTrackInfo;
-
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end
@@ -39,7 +38,6 @@ static MainController *sharedController;
         statusWindowController = [[StatusWindowController alloc] init];
         menuController = [[MenuController alloc] init];
         df = [[NSUserDefaults standardUserDefaults] retain];
-        [self setLatestSongIdentifier:@"0-0"];
     }
     return self;
 }
@@ -162,9 +160,12 @@ 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];
@@ -334,41 +335,41 @@ static MainController *sharedController;
                target:self action:@selector(showUpcomingSongs)];
     }
     
-/*    if ([df objectForKey:@"ToggleLoop"] != nil) {
+    if ([df objectForKey:@"ToggleLoop"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"ToggleLoop"
                combo:[df keyComboForKey:@"ToggleLoop"]
-               target:self action:NULL];
+               target:self action:@selector(toggleLoop)];
     }
     
     if ([df objectForKey:@"ToggleShuffle"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle"
                combo:[df keyComboForKey:@"ToggleShuffle"]
-               target:self action:NULL];
+               target:self action:@selector(toggleShuffle)];
     }
     
     if ([df objectForKey:@"IncrementVolume"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume"
                combo:[df keyComboForKey:@"IncrementVolume"]
-               target:self action:NULL];
+               target:self action:@selector(incrementVolume)];
     }
     
     if ([df objectForKey:@"DecrementVolume"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume"
                combo:[df keyComboForKey:@"DecrementVolume"]
-               target:self action:NULL];
+               target:self action:@selector(decrementVolume)];
     }
     
     if ([df objectForKey:@"IncrementRating"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating"
                combo:[df keyComboForKey:@"IncrementRating"]
-               target:self action:NULL];
+               target:self action:@selector(incrementRating)];
     }
     
     if ([df objectForKey:@"DecrementRating"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"DecrementRating"
                combo:[df keyComboForKey:@"DecrementRating"]
-               target:self action:NULL];
-    }*/
+               target:self action:@selector(decrementRating)];
+    }
 }
 
 - (void)showCurrentTrackInfo
@@ -447,6 +448,87 @@ static MainController *sharedController;
     }
 }
 
+- (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];
+}
+
 /*************************************************************************/
 #pragma mark -
 #pragma mark WORKSPACE NOTIFICATION HANDLERS
@@ -455,6 +537,8 @@ static MainController *sharedController;
 - (void)applicationLaunched:(NSNotification *)note
 {
     if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
+        [currentRemote begin];
+        [self setLatestSongIdentifier:@""];
         [self timerUpdate];
         [NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
         [self setupHotKeys];
@@ -465,11 +549,12 @@ static MainController *sharedController;
  - (void)applicationTerminated:(NSNotification *)note
  {
      if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
-         [refreshTimer invalidate];
-         [refreshTimer release];
-         refreshTimer = nil;
-         [self clearHotKeys];
-         playerRunningState = ITMTRemotePlayerNotRunning;
+        [currentRemote halt];
+        [refreshTimer invalidate];
+        [refreshTimer release];
+        refreshTimer = nil;
+        [self clearHotKeys];
+        playerRunningState = ITMTRemotePlayerNotRunning;
      }
  }
 
@@ -493,13 +578,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];