Now properly escaping all strings so ampersands now submit. Added a couple of NSLogs...

[MenuTunes.git] / MainController.h

diff --git a/MainController.h b/MainController.h
index 1245103..7348a81 100755 (executable)
--- a/MainController.h
+++ b/MainController.h
@@ -19,7 +19,9 @@
 #import <ITMTRemote/ITMTRemote.h>
 #import "MTBlingController.h"
 
 #import <ITMTRemote/ITMTRemote.h>
 #import "MTBlingController.h"
 

-@class StatusWindowController, MenuController;
+#define MT_CURRENT_VERSION 1600
+
+@class StatusWindowController, MenuController, NetworkController;

 
 @interface MainController : NSObject
 {
 
 @interface MainController : NSObject
 {


@@ -32,25 +34,33 @@
     
     //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;

+    NetworkController *networkController;

     NSUserDefaults *df;
     
     NSUserDefaults *df;
     

-    NSDate *blingDate;

     MTBlingController *bling;
     MTBlingController *bling;

-    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;
 
 - (void)menuClicked;
 
 //Methods called from MenuController by menu items
 }
 + (MainController *)sharedController;
 
 - (void)menuClicked;
 
 //Methods called from MenuController by menu items

+- (NSDate*)getBlingTime;

 - (void)blingTime;
 - (void)blingNow;
 - (BOOL)blingBling;
 
 - (void)blingTime;
 - (void)blingNow;
 - (BOOL)blingBling;
 

+- (void)timerUpdate;
+

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


@@ -60,15 +70,32 @@
 - (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)showPlayer;
 - (void)showPreferences;

+- (void)showTestWindow;

 - (void)quitMenuTunes;
 
 //
 
 - (void)quitMenuTunes;
 
 //
 

+- (void)setServerStatus:(BOOL)newStatus;
+- (int)connectToServer;
+- (BOOL)disconnectFromServer;
+- (void)checkForRemoteServerAndConnectImmediately:(BOOL)connectImmediately;
+- (void)networkError:(NSException *)exception;
+
+//
+

 - (ITMTRemote *)currentRemote;
 - (void)clearHotKeys;
 - (void)setupHotKeys;
 - (void)closePreferences;
 - (ITMTRemote *)currentRemote;
 - (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