This is a progressive checkin. It has the following effects:

[MenuTunes.git] / MenuTunes.h

diff --git a/MenuTunes.h b/MenuTunes.h
index bdbe402..6e66299 100755 (executable)
--- a/MenuTunes.h
+++ b/MenuTunes.h
@@ -14,24 +14,28 @@
 
 #import <Cocoa/Cocoa.h>
 #import <Carbon/Carbon.h>
+#import <ITKit/ITKit.h>
+#import <ITFoundation/ITFoundation.h>
+#import <ITMTRemote/ITMTRemote.h>
+
 
 //@class MenuTunesView;
-@class PreferencesController, StatusWindowController;
+@class PreferencesController, ITTransientStatusWindow;
 
 @interface MenuTunes : NSObject
 {
-    NSStatusItem *statusItem;
+    ITStatusItem *statusItem;
     NSMenu *menu;
-//  MenuTunesView *view;
-    ComponentInstance asComponent;
+    ITMTRemote *currentRemote;
+    NSMutableArray *remoteArray;
     
     //Used in updating the menu automatically
     NSTimer *refreshTimer;
-    int curTrackIndex;
-    int trackInfoIndex;
+    int trackInfoIndex, lastSongIndex;
+    BOOL isPlayingRadio;
     
-    ProcessSerialNumber iTunesPSN;
-    bool didHaveAlbumName; //Helper variable for creating the menu
+    BOOL isAppRunning;
+    BOOL didHaveAlbumName, didHaveArtistName; //Helper variable for creating the menu
     
     //For upcoming songs
     NSMenuItem *upcomingSongsItem;
@@ -48,12 +52,12 @@
     NSMenuItem *playPauseMenuItem; //Toggle between 'Play' and 'Pause'
     
     PreferencesController *prefsController;
-    StatusWindowController *statusController; //Shows track info and upcoming songs.
+    ITTransientStatusWindow *statusWindow; //Shows track info and upcoming songs.
 }
 
+- (void)registerDefaultsIfNeeded;
 - (void)rebuildMenu;
 - (void)clearHotKeys;
-- (ProcessSerialNumber)iTunesPSN;
 - (void)closePreferences;
 
 @end