Reverted back to the lame single source style playlist menu because I

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index a9e67e9..9313f11 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -14,7 +14,6 @@
 - (ITMTRemote *)loadRemote;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (ITMTRemote *)loadRemote;
 - (void)timerUpdate;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;

-- (void)showCurrentTrackInfo;

 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 @end


@@ -39,6 +38,7 @@ static MainController *sharedController;
         sharedController = self;
         
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];
         sharedController = self;
         
         remoteArray = [[NSMutableArray alloc] initWithCapacity:1];

+        [[PreferencesController sharedPrefs] setController:self];

         statusWindowController = [StatusWindowController sharedController];
         menuController = [[MenuController alloc] init];
         df = [[NSUserDefaults standardUserDefaults] retain];
         statusWindowController = [StatusWindowController sharedController];
         menuController = [[MenuController alloc] init];
         df = [[NSUserDefaults standardUserDefaults] retain];


@@ -63,7 +63,7 @@ static MainController *sharedController;
     if ([df boolForKey:@"enableSharing"]) {
         [self setServerStatus:YES];
     } else if ([df boolForKey:@"useSharedPlayer"]) {
     if ([df boolForKey:@"enableSharing"]) {
         [self setServerStatus:YES];
     } else if ([df boolForKey:@"useSharedPlayer"]) {

-        if (![self connectToServer]) {
+        if ([self connectToServer] == 0) {

             [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
         }
     }
             [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
         }
     }


@@ -243,7 +243,7 @@ static MainController *sharedController;
 
 - (BOOL)songIsPlaying
 {
 
 - (BOOL)songIsPlaying
 {

-    NSString *identifier;
+    NSString *identifier = nil;

     NS_DURING
         identifier = [[self currentRemote] playerStateUniqueIdentifier];
     NS_HANDLER
     NS_DURING
         identifier = [[self currentRemote] playerStateUniqueIdentifier];
     NS_HANDLER


@@ -254,7 +254,7 @@ static MainController *sharedController;
 
 - (BOOL)radioIsPlaying
 {
 
 - (BOOL)radioIsPlaying
 {

-    ITMTRemotePlayerPlaylistClass class;
+    ITMTRemotePlayerPlaylistClass class = nil;

     NS_DURING
         class = [[self currentRemote] currentPlaylistClass];
     NS_HANDLER
     NS_DURING
         class = [[self currentRemote] currentPlaylistClass];
     NS_HANDLER


@@ -265,7 +265,7 @@ static MainController *sharedController;
 
 - (BOOL)songChanged
 {
 
 - (BOOL)songChanged
 {

-    NSString *identifier;
+    NSString *identifier = nil;

     NS_DURING
         identifier = [[self currentRemote] playerStateUniqueIdentifier];
     NS_HANDLER
     NS_DURING
         identifier = [[self currentRemote] playerStateUniqueIdentifier];
     NS_HANDLER


@@ -292,7 +292,7 @@ static MainController *sharedController;
         [statusItem setMenu:[menuController menu]];
     }
     
         [statusItem setMenu:[menuController menu]];
     }
     

-    if ( [self songChanged] && (timerUpdating != YES) ) {
+    if ( [self songChanged] && (timerUpdating != YES) && (playerRunningState == ITMTRemotePlayerRunning) ) {

         ITDebugLog(@"The song changed.");
         timerUpdating = YES;
         
         ITDebugLog(@"The song changed.");
         timerUpdating = YES;
         


@@ -406,6 +406,7 @@ static MainController *sharedController;
 {
     ITDebugLog(@"Selecting playlist %i", index);
     NS_DURING
 {
     ITDebugLog(@"Selecting playlist %i", index);
     NS_DURING

+        //[[self currentRemote] switchToPlaylistAtIndex:(index % 1000) ofSourceAtIndex:(index / 1000)];

         [[self currentRemote] switchToPlaylistAtIndex:index];
     NS_HANDLER
         [self networkError:localException];
         [[self currentRemote] switchToPlaylistAtIndex:index];
     NS_HANDLER
         [self networkError:localException];


@@ -472,10 +473,14 @@ static MainController *sharedController;
 - (void)showPreferences
 {
     ITDebugLog(@"Show preferences.");
 - (void)showPreferences
 {
     ITDebugLog(@"Show preferences.");

-    [[PreferencesController sharedPrefs] setController:self];

     [[PreferencesController sharedPrefs] showPrefsWindow:self];
 }
 
     [[PreferencesController sharedPrefs] showPrefsWindow:self];
 }
 

+- (void)showTestWindow
+{
+    [self showCurrentTrackInfo];
+}
+

 - (void)quitMenuTunes
 {
     ITDebugLog(@"Quitting MenuTunes.");
 - (void)quitMenuTunes
 {
     ITDebugLog(@"Quitting MenuTunes.");


@@ -495,6 +500,10 @@ static MainController *sharedController;
 
 - (ITMTRemote *)currentRemote
 {
 
 - (ITMTRemote *)currentRemote
 {

+    if ([networkController isConnectedToServer] && ![[networkController networkObject] isValid]) {
+        [self networkError:nil];
+        return nil;
+    }

     return currentRemote;
 }
 
     return currentRemote;
 }
 


@@ -648,8 +657,8 @@ static MainController *sharedController;
 
 - (void)showCurrentTrackInfo
 {
 
 - (void)showCurrentTrackInfo
 {

-    ITMTRemotePlayerSource  source;
-    NSString               *title;
+    ITMTRemotePlayerSource  source      = 0;
+    NSString               *title       = nil;

     NSString               *album       = nil;
     NSString               *artist      = nil;
     NSString               *time        = nil;
     NSString               *album       = nil;
     NSString               *artist      = nil;
     NSString               *time        = nil;


@@ -695,8 +704,8 @@ static MainController *sharedController;
         }
 
         if ( [df boolForKey:@"showTrackNumber"] ) {
         }
 
         if ( [df boolForKey:@"showTrackNumber"] ) {

-            int trackNo;
-            int trackCount;
+            int trackNo    = 0;
+            int trackCount = 0;

             
             NS_DURING
                 trackNo    = [[self currentRemote] currentSongTrack];
             
             NS_DURING
                 trackNo    = [[self currentRemote] currentSongTrack];


@@ -712,7 +721,7 @@ static MainController *sharedController;
         }
 
         if ( [df boolForKey:@"showTrackRating"] ) {
         }
 
         if ( [df boolForKey:@"showTrackRating"] ) {

-            float currentRating;
+            float currentRating = 0;

             
             NS_DURING
                 currentRating = [[self currentRemote] currentSongRating];
             
             NS_DURING
                 currentRating = [[self currentRemote] currentSongRating];


@@ -740,8 +749,7 @@ static MainController *sharedController;
 
 - (void)showUpcomingSongs
 {
 
 - (void)showUpcomingSongs
 {

-    int numSongs;
-    
+    int numSongs = 0;

     NS_DURING
         numSongs = [[self currentRemote] numberOfSongsInPlaylistAtIndex:[[self currentRemote] currentPlaylistIndex]];
     NS_HANDLER
     NS_DURING
         numSongs = [[self currentRemote] numberOfSongsInPlaylistAtIndex:[[self currentRemote] currentPlaylistIndex]];
     NS_HANDLER


@@ -751,8 +759,8 @@ static MainController *sharedController;
     ITDebugLog(@"Showing upcoming songs status window.");
     NS_DURING
         if (numSongs > 0) {
     ITDebugLog(@"Showing upcoming songs status window.");
     NS_DURING
         if (numSongs > 0) {

-            NSMutableArray *songList = [NSMutableArray arrayWithCapacity:5];

             int numSongsInAdvance = [df integerForKey:@"SongsInAdvance"];
             int numSongsInAdvance = [df integerForKey:@"SongsInAdvance"];

+            NSMutableArray *songList = [NSMutableArray arrayWithCapacity:numSongsInAdvance];

             int curTrack = [[self currentRemote] currentSongIndex];
             int i;
     
             int curTrack = [[self currentRemote] currentSongIndex];
             int i;
     


@@ -762,6 +770,10 @@ static MainController *sharedController;
                 }
             }
             
                 }
             }
             

+            if ([songList count] == 0) {
+                [songList addObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")];
+            }
+            

             [statusWindowController showUpcomingSongsWindowWithTitles:songList];
         } else {
             [statusWindowController showUpcomingSongsWindowWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];
             [statusWindowController showUpcomingSongsWindowWithTitles:songList];
         } else {
             [statusWindowController showUpcomingSongsWindowWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];


@@ -943,27 +955,33 @@ static MainController *sharedController;
     }
 }
 
     }
 }
 

-- (BOOL)connectToServer
+- (int)connectToServer

 {
     int result;
     ITDebugLog(@"Attempting to connect to shared remote.");
     result = [networkController connectToHost:[df stringForKey:@"sharedPlayerHost"]];
     //Connect
     if (result == 1) {
 {
     int result;
     ITDebugLog(@"Attempting to connect to shared remote.");
     result = [networkController connectToHost:[df stringForKey:@"sharedPlayerHost"]];
     //Connect
     if (result == 1) {

+        [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];

         currentRemote = [[[networkController networkObject] remote] retain];
         currentRemote = [[[networkController networkObject] remote] retain];

+        [refreshTimer invalidate];
+        refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
+                                target:self
+                                selector:@selector(timerUpdate)
+                                userInfo:nil
+                                repeats:YES] retain];

         [self timerUpdate];
         [self timerUpdate];

-        //[refreshTimer invalidate];

         ITDebugLog(@"Connection successful.");
         ITDebugLog(@"Connection successful.");

-        return YES;
+        return 1;

     } else if (result == 0) {
         ITDebugLog(@"Connection failed.");
         currentRemote = [remoteArray objectAtIndex:0];
     } else if (result == 0) {
         ITDebugLog(@"Connection failed.");
         currentRemote = [remoteArray objectAtIndex:0];

-        return NO;
-    } else if (result == -1) {
+        return 0;
+    } else {
+        //Do something about the password being invalid

         ITDebugLog(@"Connection failed.");
         currentRemote = [remoteArray objectAtIndex:0];
         ITDebugLog(@"Connection failed.");
         currentRemote = [remoteArray objectAtIndex:0];

-        return NO;
-        //Do something about the password being invalid
+        return -1;

     }
 }
 
     }
 }
 


@@ -984,7 +1002,7 @@ static MainController *sharedController;
     if ([networkController checkForServerAtHost:[df stringForKey:@"sharedPlayerHost"]]) {
         ITDebugLog(@"Remote server found.");
         [timer invalidate];
     if ([networkController checkForServerAtHost:[df stringForKey:@"sharedPlayerHost"]]) {
         ITDebugLog(@"Remote server found.");
         [timer invalidate];

-        if (![networkController isConnectedToServer]) {
+        if (![networkController isServerOn] && ![networkController isConnectedToServer]) {

             [[StatusWindowController sharedController] showReconnectQueryWindow];
         }
     } else {
             [[StatusWindowController sharedController] showReconnectQueryWindow];
         }
     } else {


@@ -995,10 +1013,10 @@ static MainController *sharedController;
 - (void)networkError:(NSException *)exception
 {
     ITDebugLog(@"Remote exception thrown: %@: %@", [exception name], [exception reason]);
 - (void)networkError:(NSException *)exception
 {
     ITDebugLog(@"Remote exception thrown: %@: %@", [exception name], [exception reason]);

-    NSLog(@"%@", [exception reason]);
-    if ([[exception name] isEqualToString:NSPortTimeoutException] && [networkController isConnectedToServer]) {
+    if ( ((exception == nil) || [[exception name] isEqualToString:NSPortTimeoutException]) && [networkController isConnectedToServer]) {

         NSRunCriticalAlertPanel(@"Remote MenuTunes Disconnected", @"The MenuTunes server you were connected to stopped responding or quit. MenuTunes will revert back to the local player.", @"OK", nil, nil);
         if ([self disconnectFromServer]) {
         NSRunCriticalAlertPanel(@"Remote MenuTunes Disconnected", @"The MenuTunes server you were connected to stopped responding or quit. MenuTunes will revert back to the local player.", @"OK", nil, nil);
         if ([self disconnectFromServer]) {

+            [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];

             [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
         } else {
             ITDebugLog(@"CRITICAL ERROR, DISCONNECTING!");
             [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
         } else {
             ITDebugLog(@"CRITICAL ERROR, DISCONNECTING!");


@@ -1008,7 +1026,7 @@ static MainController *sharedController;
 
 - (void)reconnect
 {
 
 - (void)reconnect
 {

-    if (![self connectToServer]) {
+    if ([self connectToServer] == 0) {

         [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
     }
     [[StatusWindow sharedWindow] setLocked:NO];
         [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
     }
     [[StatusWindow sharedWindow] setLocked:NO];


@@ -1055,12 +1073,23 @@ static MainController *sharedController;
     NS_DURING
         if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]]) {
             ITDebugLog(@"Remote application terminated.");
     NS_DURING
         if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[[self currentRemote] playerFullName]]) {
             ITDebugLog(@"Remote application terminated.");

+            playerRunningState = ITMTRemotePlayerNotRunning;

             [[self currentRemote] halt];
             [refreshTimer invalidate];
             [refreshTimer release];
             refreshTimer = nil;
             [self clearHotKeys];
             [[self currentRemote] halt];
             [refreshTimer invalidate];
             [refreshTimer release];
             refreshTimer = nil;
             [self clearHotKeys];

-            playerRunningState = ITMTRemotePlayerNotRunning;
+            
+            if ([df objectForKey:@"ShowPlayer"] != nil) {
+                ITHotKey *hotKey;
+                ITDebugLog(@"Setting up show player hot key.");
+                hotKey = [[ITHotKey alloc] init];
+                [hotKey setName:@"ShowPlayer"];
+                [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]]];
+                [hotKey setTarget:self];
+                [hotKey setAction:@selector(showPlayer)];
+                [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]];
+            }

         }
     NS_HANDLER
         [self networkError:localException];
         }
     NS_HANDLER
         [self networkError:localException];


@@ -1075,8 +1104,8 @@ static MainController *sharedController;
 
 - (void)applicationWillTerminate:(NSNotification *)note
 {
 
 - (void)applicationWillTerminate:(NSNotification *)note
 {

-    [self clearHotKeys];

     [networkController stopRemoteServerSearch];
     [networkController stopRemoteServerSearch];

+    [self clearHotKeys];

     [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
 }
 
     [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
 }
 


@@ -1097,5 +1126,4 @@ static MainController *sharedController;
     [super dealloc];
 }
 
     [super dealloc];
 }
 

-

 @end
\ No newline at end of file
 @end
\ No newline at end of file