X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/0e4a6623849f7fd40f3c577e08e9ca999abdcc7e..276579746a9cbe94b358155d6eb1aff0b07760a0:/MainController.h?ds=inline

diff --git a/MainController.h b/MainController.h
index 6db9977..7348a81 100755
--- a/MainController.h
+++ b/MainController.h
@@ -19,7 +19,7 @@
 #import <ITMTRemote/ITMTRemote.h>
 #import "MTBlingController.h"
 
-#define MT_CURRENT_VERSION 1300
+#define MT_CURRENT_VERSION 1600
 
 @class StatusWindowController, MenuController, NetworkController;
 
@@ -34,7 +34,8 @@
     
     //Used in updating the menu automatically
     NSTimer *refreshTimer;
-    NSString *_latestSongIdentifier;
+    NSString *_latestSongIdentifier, *_toolTip;
+	NSDictionary *_lastTrackInfo;
 
     StatusWindowController *statusWindowController; //Shows status windows
     MenuController *menuController;
@@ -42,9 +43,11 @@
     NSUserDefaults *df;
     
     MTBlingController *bling;
-    NSTimer *registerTimer;
-    BOOL timerUpdating;
+    NSTimer *registerTimer, *_statusWindowUpdateTimer, *_audioscrobblerTimer;
+    BOOL timerUpdating, _checkingForServer, _popped, _open, _needsPolling;
     BOOL blinged;
+	int _timeUpdateCount; //Keeps track of how many times the time has been updated in the info status window
+    NSLock *_serverCheckLock;
 }
 + (MainController *)sharedController;
 
@@ -67,6 +70,7 @@
 - (void)selectSongAtIndex:(int)index;
 - (void)selectSongRating:(int)rating;
 - (void)selectEQPresetAtIndex:(int)index;
+- (void)makePlaylistWithTerm:(NSString *)term ofType:(int)type;
 - (void)showPlayer;
 - (void)showPreferences;
 - (void)showTestWindow;
@@ -77,7 +81,7 @@
 - (void)setServerStatus:(BOOL)newStatus;
 - (int)connectToServer;
 - (BOOL)disconnectFromServer;
-- (void)checkForRemoteServer;
+- (void)checkForRemoteServerAndConnectImmediately:(BOOL)connectImmediately;
 - (void)networkError:(NSException *)exception;
 
 //