Merge branch 'master' of git://github.com/ksuther/MenuTunes

[MenuTunes.git] / MenuController.h

diff --git a/MenuController.h b/MenuController.h
index 55ae240..8981e59 100755 (executable)
--- a/MenuController.h
+++ b/MenuController.h
@@ -1,13 +1,12 @@
-//
-//  MenuController.h
-//  MenuTunes
-//
-//  Created by Joseph Spiros on Wed Apr 30 2003.
-//  Copyright (c) 2003 iThink Software. All rights reserved.
-//
+/*
+ *     MenuTunes
+ *     MenuController.h
+ *
+ *     Copyright (c) 2003 iThink Software
+ *
+ */

 
 #import <Cocoa/Cocoa.h>
 
 #import <Cocoa/Cocoa.h>

-#import "ITMTRemote.h"

 
 // Internal: To be used with NSMenuItems as their tag, for use with the NSMenuValidation stuff.
 // Also will be used in supplying the controller with the layout to use for the MenuItems, unless
 
 // Internal: To be used with NSMenuItems as their tag, for use with the NSMenuValidation stuff.
 // Also will be used in supplying the controller with the layout to use for the MenuItems, unless


@@ -35,24 +34,23 @@ typedef enum {
     MTMenuNextTrackItem,
     MTMenuShowPlayerItem,
     MTMenuPreferencesItem,
     MTMenuNextTrackItem,
     MTMenuShowPlayerItem,
     MTMenuPreferencesItem,

-    MTMenuQuitItem,
-    MTMenuRegisterItem
+       MTMenuAboutItem,
+    MTMenuQuitItem

 } MTMenuItemTag;
 
 @interface MenuController : NSObject
 {
     NSMutableArray *_menuLayout;
     NSMenu *_currentMenu;
 } MTMenuItemTag;
 
 @interface MenuController : NSObject
 {
     NSMutableArray *_menuLayout;
     NSMenu *_currentMenu;

-    NSMenu *_ratingMenu, *_upcomingSongsMenu, *_eqMenu, *_playlistsMenu; //Submenus
+    NSMenu *_ratingMenu, *_upcomingSongsMenu, *_eqMenu, *_playlistsMenu, *_artistsMenu, *_albumsMenu; //Submenus

     
     

-    ITMTRemote *currentRemote;

     int _currentPlaylist, _currentTrack;
     int _currentPlaylist, _currentTrack;

-    BOOL _playingRadio;
+    BOOL _playingRadio, _continue;

 }
 
 - (NSMenu *)menu;
 - (NSMenu *)menuForNoPlayer;
 }
 
 - (NSMenu *)menu;
 - (NSMenu *)menuForNoPlayer;

-- (void)rebuildSubmenus;
+- (BOOL)rebuildSubmenus;

 
 // - (NSArray *)menuLayout;
 // - (void)setMenuLayout:(NSArray *)newLayoutArray;
 
 // - (NSArray *)menuLayout;
 // - (void)setMenuLayout:(NSArray *)newLayoutArray;