From: Kent Sutherland <ksuther@ithinksw.com>
Date: Thu, 25 Sep 2003 00:49:58 +0000 (+0000)
Subject: Fixed the toggle loop problem.
X-Git-Tag: v1.0~45
X-Git-Url: http://git.ithinksw.org/MenuTunes.git/commitdiff_plain/5b82496caef98719afa343cba1a708b77eeaf2c0

Fixed the toggle loop problem.
---

diff --git a/MainController.m b/MainController.m
index 517c892..ec906a3 100755
--- a/MainController.m
+++ b/MainController.m
@@ -576,7 +576,6 @@ static MainController *sharedController;
 - (void)toggleLoop
 {
     ITMTRemotePlayerRepeatMode repeatMode = [currentRemote repeatMode];
-    
     switch (repeatMode) {
         case ITMTRemotePlayerRepeatOff:
             repeatMode = ITMTRemotePlayerRepeatAll;
diff --git a/PreferencesController.m b/PreferencesController.m
index c2af444..327aa90 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -758,14 +758,14 @@ static PreferencesController *prefs = nil;
 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
 {
     if (aTableView == menuTableView) {
+        NSString *object = [myItems objectAtIndex:rowIndex];
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
-            NSString *object = [myItems objectAtIndex:rowIndex];
-            if ([object isEqualToString:@"Show Player"]) {
+            if ([object isEqualToString:@"showPlayer"]) {
                 return [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]];
             }
             return NSLocalizedString(object, @"ERROR");
         } else {
-            if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]])
+            if ([submenuItems containsObject:object])
             {
                 return [NSImage imageNamed:@"submenu"];
             } else {
@@ -773,10 +773,14 @@ static PreferencesController *prefs = nil;
             }
         }
     } else {
+        NSString *object = [availableItems objectAtIndex:rowIndex];
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
-            return NSLocalizedString([availableItems objectAtIndex:rowIndex], @"ERROR");
+            if ([object isEqualToString:@"showPlayer"]) {
+                return [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]];
+            }
+            return NSLocalizedString(object, @"ERROR");
         } else {
-            if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]]) {
+            if ([submenuItems containsObject:object]) {
                 return [NSImage imageNamed:@"submenu"];
             } else {
                 return nil;
diff --git a/iTunesRemote.m b/iTunesRemote.m
index 07a9b2e..2a86e22 100755
--- a/iTunesRemote.m
+++ b/iTunesRemote.m
@@ -318,7 +318,8 @@
 
     switch (m00f)
 	   {
-	   case 'kRp0':
+	   //case 'kRp0':
+           case 1800564815:
 		  result = ITMTRemotePlayerRepeatOff;
 		  break;
 	   case 'kRp1':
@@ -328,7 +329,6 @@
 		  result = ITMTRemotePlayerRepeatAll;
 		  break;
 	   }
-    
     return result;
 }