X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/166324bee63502af1f85f9eb1126fbb5db19e0c0..d1557bdd8bce673c8d2a314f80a10d46c84dd93b:/OldMainController.h

diff --git a/OldMainController.h b/OldMainController.h
index 44664ac..dfab004 100755
--- a/OldMainController.h
+++ b/OldMainController.h
@@ -17,10 +17,8 @@
 #import <ITKit/ITKit.h>
 #import <ITFoundation/ITFoundation.h>
 #import <ITMTRemote/ITMTRemote.h>
-#import <StatusWindow.h>
-
-//@class MenuTunesView;
-@class PreferencesController, StatusWindow;
+#import "PreferencesController.h"
+#import "StatusWindow.h"
 
 @interface MainController : NSObject
 {
@@ -32,8 +30,8 @@
     //Used in updating the menu automatically
     NSTimer *refreshTimer;
     int      trackInfoIndex;
-    int      lastSongIndex;
     int      lastPlaylistIndex;
+    NSString *lastSongIdentifier;
     BOOL     isPlayingRadio;
     
     ITMTRemotePlayerRunningState isAppRunning;
@@ -53,10 +51,10 @@
     NSMenu     *eqMenu;
     
     //For song ratings
-    NSMenuItem *songRatingMenuItem;
+    NSMenuItem *ratingItem;
     NSMenu *ratingMenu;
     
-    NSMenuItem *playPauseMenuItem; //Toggle between 'Play' and 'Pause'
+    NSMenuItem *playPauseItem; //Toggle between 'Play' and 'Pause'
     
     PreferencesController *prefsController;
     StatusWindow *statusWindow; //Shows track info and upcoming songs.