Lots of code to keep MT from being bad when iTunes locks. Fixed leak in

[MenuTunes.git] / MainController.h

diff --git a/MainController.h b/MainController.h
index 6db9977..ca26af8 100755 (executable)
--- a/MainController.h
+++ b/MainController.h
@@ -34,7 +34,7 @@
     
     //Used in updating the menu automatically
     NSTimer *refreshTimer;
     
     //Used in updating the menu automatically
     NSTimer *refreshTimer;

-    NSString *_latestSongIdentifier;
+    NSString *_latestSongIdentifier, *_toolTip;

 
     StatusWindowController *statusWindowController; //Shows status windows
     MenuController *menuController;
 
     StatusWindowController *statusWindowController; //Shows status windows
     MenuController *menuController;


@@ -43,8 +43,9 @@
     
     MTBlingController *bling;
     NSTimer *registerTimer;
     
     MTBlingController *bling;
     NSTimer *registerTimer;

-    BOOL timerUpdating;
+    BOOL timerUpdating, _checkingForServer, _popped;

     BOOL blinged;
     BOOL blinged;

+    NSLock *_serverCheckLock;

 }
 + (MainController *)sharedController;
 
 }
 + (MainController *)sharedController;
 


@@ -67,6 +68,7 @@
 - (void)selectSongAtIndex:(int)index;
 - (void)selectSongRating:(int)rating;
 - (void)selectEQPresetAtIndex:(int)index;
 - (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;
 - (void)showPlayer;
 - (void)showPreferences;
 - (void)showTestWindow;


@@ -77,7 +79,7 @@
 - (void)setServerStatus:(BOOL)newStatus;
 - (int)connectToServer;
 - (BOOL)disconnectFromServer;
 - (void)setServerStatus:(BOOL)newStatus;
 - (int)connectToServer;
 - (BOOL)disconnectFromServer;

-- (void)checkForRemoteServer;
+- (void)checkForRemoteServerAndConnectImmediately:(BOOL)connectImmediately;

 - (void)networkError:(NSException *)exception;
 
 //
 - (void)networkError:(NSException *)exception;
 
 //