Bumped versions to 1.6

[MenuTunes.git] / MainController.h

diff --git a/MainController.h b/MainController.h
index b03349d..2ea08ba 100755 (executable)
--- a/MainController.h
+++ b/MainController.h
@@ -19,6 +19,8 @@
 #import <ITMTRemote/ITMTRemote.h>
 #import "MTBlingController.h"
 
 #import <ITMTRemote/ITMTRemote.h>
 #import "MTBlingController.h"
 

+#define MT_CURRENT_VERSION 1600
+

 @class StatusWindowController, MenuController, NetworkController;
 
 @interface MainController : NSObject
 @class StatusWindowController, MenuController, NetworkController;
 
 @interface MainController : NSObject


@@ -32,7 +34,8 @@
     
     //Used in updating the menu automatically
     NSTimer *refreshTimer;
     
     //Used in updating the menu automatically
     NSTimer *refreshTimer;

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

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


@@ -40,9 +43,11 @@
     NSUserDefaults *df;
     
     MTBlingController *bling;
     NSUserDefaults *df;
     
     MTBlingController *bling;

-    NSTimer *registerTimer;
-    BOOL timerUpdating;
+    NSTimer *registerTimer, *_statusWindowUpdateTimer;
+    BOOL timerUpdating, _checkingForServer, _popped, _open, _needsPolling;

     BOOL blinged;
     BOOL blinged;

+       int _timeUpdateCount; //Keeps track of how many times the time has been updated in the info status window
+    NSLock *_serverCheckLock;

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


@@ -54,6 +59,8 @@
 - (void)blingNow;
 - (BOOL)blingBling;
 
 - (void)blingNow;
 - (BOOL)blingBling;
 

+- (void)timerUpdate;
+

 - (void)playPause;
 - (void)nextSong;
 - (void)prevSong;
 - (void)playPause;
 - (void)nextSong;
 - (void)prevSong;


@@ -63,6 +70,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;


@@ -73,6 +81,7 @@
 - (void)setServerStatus:(BOOL)newStatus;
 - (int)connectToServer;
 - (BOOL)disconnectFromServer;
 - (void)setServerStatus:(BOOL)newStatus;
 - (int)connectToServer;
 - (BOOL)disconnectFromServer;

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

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


@@ -81,5 +90,12 @@
 - (void)clearHotKeys;
 - (void)setupHotKeys;
 - (void)closePreferences;
 - (void)clearHotKeys;
 - (void)setupHotKeys;
 - (void)closePreferences;

+- (MenuController *)menuController;
+
+- (void)showCurrentTrackInfo;

 
 @end
 
 @end

+
+@interface NSImage (SmoothAdditions)
+- (NSImage *)imageScaledSmoothlyToSize:(NSSize)scaledSize;
+@end
\ No newline at end of file