git.ithinksw.org
/
MenuTunes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
2c0cf32
..
7348a81
100755
(executable)
--- a/
MainController.h
+++ b/
MainController.h
@@
-19,7
+19,7
@@
#import <ITMTRemote/ITMTRemote.h>
#import "MTBlingController.h"
#import <ITMTRemote/ITMTRemote.h>
#import "MTBlingController.h"
-#define MT_CURRENT_VERSION 1
3
00
+#define MT_CURRENT_VERSION 1
6
00
@class StatusWindowController, MenuController, NetworkController;
@class StatusWindowController, MenuController, NetworkController;
@@
-34,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;
@@
-42,9
+43,11
@@
NSUserDefaults *df;
MTBlingController *bling;
NSUserDefaults *df;
MTBlingController *bling;
- NSTimer *registerTimer;
- BOOL timerUpdating;
+ NSTimer *registerTimer
, *_statusWindowUpdateTimer, *_audioscrobblerTimer
;
+ 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;
@@
-67,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;
@@
-77,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;
//
@@
-90,3
+95,7
@@
- (void)showCurrentTrackInfo;
@end
- (void)showCurrentTrackInfo;
@end
+
+@interface NSImage (SmoothAdditions)
+- (NSImage *)imageScaledSmoothlyToSize:(NSSize)scaledSize;
+@end
\ No newline at end of file