X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/9ba1419655d7d247210a4ed2e7a220ddf82d80cb..fdafd4ab39c062a3d5854f1c047f53108e42218e:/MenuController.m

diff --git a/MenuController.m b/MenuController.m
index f434ccc..cd30070 100755
--- a/MenuController.m
+++ b/MenuController.m
@@ -7,23 +7,78 @@
 //
 
 #import "MenuController.h"
-#import "MainController.h"
+#import "NewMainController.h"
+#import "ITMTRemote.h"
 
 @implementation MenuController
 
 - (id)init
 {
     if ( (self = [super init]) ) {
-        _menuLayout = [[NSMutableArray alloc] initWithCapacity:
+        _menuLayout = [[NSMutableArray alloc] initWithCapacity:0];
     }
     return self;
 }
 
 - (NSMenu *)menu
 {
+    NSMenu *menu = [[NSMenu alloc] initWithTitle:@""];
+    NSArray *menuArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"];
+    NSEnumerator *enumerator = [menuArray objectEnumerator];
+    NSString *nextObject;
+    ITMTRemote *currentRemote = [[MainController sharedController] currentRemote];
+    NSMenuItem *tempItem;
+    
+    //Get the current playlist, track index, etc.
+    int playlistIndex = [currentRemote currentPlaylistIndex];
+    int trackIndex = [currentRemote currentSongIndex];
+    
     // dynamically create menu from supplied data and layout information.
-    // ...
-    // right before returning the menu, set the created menu to instance variable _currentMenu.
+    while ( (nextObject = [enumerator nextObject]) ) {
+        if ([nextObject isEqualToString:@"Play/Pause"]) {
+            tempItem = [menu addItemWithTitle:@"Play"
+                    action:@selector(performMainMenuAction:)
+                    keyEquivalent:@""];
+            [tempItem setTag:MTMenuPlayPauseItem];
+            [tempItem setTarget:self];
+            
+            switch ([currentRemote playerPlayingState]) {
+                case ITMTRemotePlayerPlaying:
+                    [tempItem setTitle:@"Pause"];
+                break;
+                case ITMTRemotePlayerRewinding:
+                case ITMTRemotePlayerForwarding:
+                    [tempItem setTitle:@"Resume"];
+                break;
+                default:
+                break;
+            }
+        } else if ([nextObject isEqualToString:@"Next Track"]) {
+            tempItem = [menu addItemWithTitle:@"Next Track"
+                    action:@selector(performMainMenuAction:)
+                    keyEquivalent:@""];
+            [tempItem setTag:MTMenuNextTrackItem];
+            [tempItem setTarget:self];
+        } else if ([nextObject isEqualToString:@"Previous Track"]) {
+            tempItem = [menu addItemWithTitle:@"Previous Track"
+                    action:@selector(performMainMenuAction:)
+                    keyEquivalent:@""];
+            [tempItem setTag:MTMenuPreviousTrackItem];
+            [tempItem setTarget:self];
+        } else if ([nextObject isEqualToString:@"Current Track Info"]) {
+            NSString *title = [currentRemote currentSongTitle];
+            [menu addItemWithTitle:@"Now Playing" action:NULL keyEquivalent:@""];
+            
+            if ([title length] > 0) {
+                [menu addItemWithTitle:[NSString stringWithFormat:@"	 %@", title] action:nil keyEquivalent:@""];
+            }
+        }
+        //Do cool stuff here woo hehe gack yay! 0_o
+    }
+    
+    [_currentMenu release];
+    _currentMenu = menu;
+    return _currentMenu;
 }
 
 - (void)performMainMenuAction:(id)sender
@@ -79,12 +134,12 @@
 
 - (void)performEqualizerMenuAction:(id)sender
 {
-    [[MainController sharedController] selectEQItemAtIndex:[sender tag]]
+    [[MainController sharedController] selectEQPresetAtIndex:[sender tag]];
 }
 
 - (void)performUpcomingSongsMenuAction:(id)sender
 {
-    [[MainController sharedController] selectSongAtIndex:[sender tag]]
+    [[MainController sharedController] selectSongAtIndex:[sender tag]];
 }
 
 - (void)updateMenu
@@ -95,6 +150,7 @@
 
 - (BOOL)validateMenuItem:(id <NSMenuItem>)menuItem
 {
+    return YES;
 }
 
 - (NSString *)systemUIColor
@@ -103,7 +159,7 @@
     NSNumber *tmpNumber;
     if ( (tmpDict = [NSDictionary dictionaryWithContentsOfFile:[@"~/Library/Preferences/.GlobalPreferences.plist" stringByExpandingTildeInPath]]) ) {
         if ( (tmpNumber = [tmpDict objectForKey:@"AppleAquaColorVariant"]) ) {
-            if ( ([tmpNumber intValue == 1) ) {
+            if ( ([tmpNumber intValue] == 1) ) {
                 return @"Aqua";
             } else {
                 return @"Graphite";