Finally fixed all the memory leaks, I hope. Fixed iTunesRemote to not

[MenuTunes.git] / OldMainController.h

diff --git a/OldMainController.h b/OldMainController.h
index 44664ac..d96bbd1 100755 (executable)
--- 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,13 +30,13 @@
     //Used in updating the menu automatically
     NSTimer *refreshTimer;
     int      trackInfoIndex;
-    int      lastSongIndex;
+    
     int      lastPlaylistIndex;
+    NSString *lastSongIdentifier;
+    int      lastSongRating;
     BOOL     isPlayingRadio;
     
     ITMTRemotePlayerRunningState isAppRunning;
-    BOOL didHaveAlbumName;
-    BOOL didHaveArtistName; //Helper variable for creating the menu
     
     //For upcoming songs
     NSMenuItem *upcomingSongsItem;
@@ -53,21 +51,20 @@
     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.
 }
 
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 
-- (void)registerDefaults;
 - (void)rebuildMenu;
 
+- (ITMTRemote *)currentRemote;
 - (void)clearHotKeys;
 - (void)closePreferences;