X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/89e6aacd25d9f355b9dac9c22973e6a5161b3f88..HEAD:/MainController.h

diff --git a/MainController.h b/MainController.h
index f4f9f7b..e89ea6c 100755
--- a/MainController.h
+++ b/MainController.h
@@ -1,23 +1,20 @@
 /*
  *	MenuTunes
- *  MainController
- *    App Controller Class
+ *	MainController.h
  *
- *  Original Author : Matthew Judy <mjudy@ithinksw.com>
- *   Responsibility : Matthew Judy <mjudy@ithinksw.com>
+ *	App Controller Class.
  *
- *  Copyright (c) 2002-2003 iThink Software.
- *  All Rights Reserved
+ *	Copyright (c) 2002-2003 iThink Software
  *
  */
 
-
 #import <Cocoa/Cocoa.h>
 #import <Carbon/Carbon.h>
 #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 +29,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,15 +58,18 @@
 - (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)quitMenuTunes;
 
 //
 
 - (void)setServerStatus:(BOOL)newStatus;
-- (BOOL)connectToServer;
+- (int)connectToServer;
 - (BOOL)disconnectFromServer;
+- (void)checkForRemoteServerAndConnectImmediately:(BOOL)connectImmediately;
 - (void)networkError:(NSException *)exception;
 
 //
@@ -80,5 +78,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