X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/0b83e13fdd374e0ac55397663cedb94bf8df197f..3711292832129bcfcb24949c59c8f2dcae0aea63:/MainController.h

diff --git a/MainController.h b/MainController.h
index b03349d..472402a 100755
--- a/MainController.h
+++ b/MainController.h
@@ -17,7 +17,8 @@
 #import <ITKit/ITKit.h>
 #import <ITFoundation/ITFoundation.h>
 #import <ITMTRemote/ITMTRemote.h>
-#import "MTBlingController.h"
+
+#define MT_CURRENT_VERSION 1720
 
 @class StatusWindowController, MenuController, NetworkController;
 
@@ -32,27 +33,25 @@
     
     //Used in updating the menu automatically
     NSTimer *refreshTimer;
-    NSString *_latestSongIdentifier;
+    NSString *_latestSongIdentifier, *_toolTip;
+	NSDictionary *_lastTrackInfo;
 
     StatusWindowController *statusWindowController; //Shows status windows
     MenuController *menuController;
     NetworkController *networkController;
     NSUserDefaults *df;
     
-    MTBlingController *bling;
-    NSTimer *registerTimer;
-    BOOL timerUpdating;
-    BOOL blinged;
+    NSTimer *_statusWindowUpdateTimer, *_audioscrobblerTimer;
+    BOOL timerUpdating, _checkingForServer, _popped, _open, _needsPolling;
+	int _timeUpdateCount; //Keeps track of how many times the time has been updated in the info status window
+	int _audioscrobblerInterval;
+    NSLock *_serverCheckLock;
 }
 + (MainController *)sharedController;
 
 - (void)menuClicked;
 
-//Methods called from MenuController by menu items
-- (NSDate*)getBlingTime;
-- (void)blingTime;
-- (void)blingNow;
-- (BOOL)blingBling;
+- (void)timerUpdate;
 
 - (void)playPause;
 - (void)nextSong;
@@ -63,6 +62,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;
@@ -73,6 +73,7 @@
 - (void)setServerStatus:(BOOL)newStatus;
 - (int)connectToServer;
 - (BOOL)disconnectFromServer;
+- (void)checkForRemoteServerAndConnectImmediately:(BOOL)connectImmediately;
 - (void)networkError:(NSException *)exception;
 
 //
@@ -81,5 +82,13 @@
 - (void)clearHotKeys;
 - (void)setupHotKeys;
 - (void)closePreferences;
+- (MenuController *)menuController;
+
+- (void)showCurrentAlbumArt;
+- (void)showCurrentTrackInfo;
 
 @end
+
+@interface NSImage (SmoothAdditions)
+- (NSImage *)imageScaledSmoothlyToSize:(NSSize)scaledSize;
+@end
\ No newline at end of file