Fixed the toggle loop problem.
authorKent Sutherland <ksuther@ithinksw.com>
Thu, 25 Sep 2003 00:49:58 +0000 (00:49 +0000)
committerKent Sutherland <ksuther@ithinksw.com>
Thu, 25 Sep 2003 00:49:58 +0000 (00:49 +0000)
MainController.m
PreferencesController.m
iTunesRemote.m

index 517c892..ec906a3 100755 (executable)
@@ -576,7 +576,6 @@ static MainController *sharedController;
 - (void)toggleLoop
 {
     ITMTRemotePlayerRepeatMode repeatMode = [currentRemote repeatMode];
-    
     switch (repeatMode) {
         case ITMTRemotePlayerRepeatOff:
             repeatMode = ITMTRemotePlayerRepeatAll;
index c2af444..327aa90 100755 (executable)
@@ -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;
index 07a9b2e..2a86e22 100755 (executable)
 
     switch (m00f)
           {
-          case 'kRp0':
+          //case 'kRp0':
+           case 1800564815:
                  result = ITMTRemotePlayerRepeatOff;
                  break;
           case 'kRp1':
                  result = ITMTRemotePlayerRepeatAll;
                  break;
           }
-    
     return result;
 }