Upgrading MenuTunes to Xcode 2.1 and updating code

[MenuTunes.git] / StatusWindowController.h

diff --git a/StatusWindowController.h b/StatusWindowController.h
index 2cf440b..c5a4566 100755 (executable)
--- a/StatusWindowController.h
+++ b/StatusWindowController.h
@@ -14,15 +14,13 @@
 
 #import <Cocoa/Cocoa.h>
 #import "ITMTRemote.h"
 
 #import <Cocoa/Cocoa.h>
 #import "ITMTRemote.h"

-
-
-@class StatusWindow;
+#import "StatusWindow.h"

 
 
 typedef enum {
 
 
 typedef enum {

-    StatusWindowRepeatNone,
+    StatusWindowRepeatNone = -1,

     StatusWindowRepeatGroup,
     StatusWindowRepeatGroup,

-    StatusWindowRepeatSong
+    StatusWindowRepeatTrack

 } StatusWindowRepeatMode;
 
 
 } StatusWindowRepeatMode;
 
 


@@ -31,22 +29,31 @@ typedef enum {
     NSUserDefaults *df;
 }
 
     NSUserDefaults *df;
 }
 

++ (StatusWindowController *)sharedController;
+

 - (void)showUpcomingSongsWindowWithTitles:(NSArray *)titleStrings;
 
 - (void)showVolumeWindowWithLevel:(float)level;
 - (void)showUpcomingSongsWindowWithTitles:(NSArray *)titleStrings;
 
 - (void)showVolumeWindowWithLevel:(float)level;

-- (void)showRatingWindowWithRating:(int)rating;
+- (void)showRatingWindowWithRating:(float)rating;

 - (void)showShuffleWindow:(BOOL)shuffle;
 - (void)showRepeatWindowWithMode:(StatusWindowRepeatMode)mode;
 - (void)showSetupQueryWindow;
 - (void)showShuffleWindow:(BOOL)shuffle;
 - (void)showRepeatWindowWithMode:(StatusWindowRepeatMode)mode;
 - (void)showSetupQueryWindow;

+- (void)showRegistrationQueryWindow;
+- (void)showReconnectQueryWindow;
+- (void)showNetworkErrorQueryWindow;
+- (void)showPreferencesUpdateWindow;
+- (void)showDebugModeEnabledWindow;

 
 - (void)showSongInfoWindowWithSource:(ITMTRemotePlayerSource)source
                                title:            (NSString *)title
                                album:            (NSString *)album
                               artist:            (NSString *)artist
 
 - (void)showSongInfoWindowWithSource:(ITMTRemotePlayerSource)source
                                title:            (NSString *)title
                                album:            (NSString *)album
                               artist:            (NSString *)artist

-                                time:            (NSString *)time
-                         trackNumber:                   (int)trackNumber
-                          trackTotal:                      (int)trackTotal
-                              rating:                   (int)rating;
+                            composer:            (NSString *)composer
+                                time:            (NSString *)time  // FLOW: Should probably be NSDate or something.
+                               track:            (NSString *)track
+                              rating:                   (int)rating
+                           playCount:                   (int)playCount
+                               image:             (NSImage *)art;

 
 
 @end
 
 
 @end