Merge branch 'master' of git://github.com/ksuther/MenuTunes

[MenuTunes.git] / MainController.h

diff --git a/MainController.h b/MainController.h
index 5fb00ec..e89ea6c 100755 (executable)
--- a/MainController.h
+++ b/MainController.h
@@ -1,25 +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 1520
+#define MT_CURRENT_VERSION 1720
 
 @class StatusWindowController, MenuController, NetworkController;
 
@@ -42,23 +37,16 @@
     NetworkController *networkController;
     NSUserDefaults *df;
     
-    MTBlingController *bling;
-    NSTimer *registerTimer;
+    NSTimer *_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
+       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;
@@ -92,6 +80,7 @@
 - (void)closePreferences;
 - (MenuController *)menuController;
 
+- (void)showCurrentAlbumArt;
 - (void)showCurrentTrackInfo;
 
 @end