Hotkeys set in the prefs will now properly update immediately.

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index 940766c..906dca5 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -10,11 +10,7 @@
 #import "StatusWindowController.h"
 #import "StatusItemHack.h"
 
 #import "StatusWindowController.h"
 #import "StatusItemHack.h"
 

-@interface NSImage (WeeAdditions)
-- (NSImage *)imageScaledSmoothlyToSize:(NSSize)scaledSize;
-@end
-
-@implementation NSImage (WeeAdditions)
+@implementation NSImage (SmoothAdditions)

 
 - (NSImage *)imageScaledSmoothlyToSize:(NSSize)scaledSize
 {
 
 - (NSImage *)imageScaledSmoothlyToSize:(NSSize)scaledSize
 {


@@ -264,7 +260,7 @@ static MainController *sharedController;
             [self setupHotKeys];
             if (![refreshTimer isValid]) {
                 [refreshTimer release];
             [self setupHotKeys];
             if (![refreshTimer isValid]) {
                 [refreshTimer release];

-                refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:0.5
+                refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)

                              target:self
                              selector:@selector(timerUpdate)
                              userInfo:nil
                              target:self
                              selector:@selector(timerUpdate)
                              userInfo:nil


@@ -352,7 +348,7 @@ static MainController *sharedController;
             while ( (nextScript = [scriptsEnum nextObject]) ) {
                 NSDictionary *error;
                 NSAppleScript *currentScript = [[NSAppleScript alloc] initWithContentsOfURL:[NSURL fileURLWithPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] stringByAppendingPathComponent:nextScript]] error:&error];
             while ( (nextScript = [scriptsEnum nextObject]) ) {
                 NSDictionary *error;
                 NSAppleScript *currentScript = [[NSAppleScript alloc] initWithContentsOfURL:[NSURL fileURLWithPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] stringByAppendingPathComponent:nextScript]] error:&error];

-                NSLog(@"Running script: %@", nextScript);
+                ITDebugLog(@"Running script: %@", nextScript);

                 if (!currentScript || ![currentScript executeAndReturnError:nil]) {
                     ITDebugLog(@"Error running script %@.", nextScript);
                 }
                 if (!currentScript || ![currentScript executeAndReturnError:nil]) {
                     ITDebugLog(@"Error running script %@.", nextScript);
                 }


@@ -632,7 +628,7 @@ static MainController *sharedController;
     ITHotKey *hotKey;
     ITDebugLog(@"Setting up hot keys.");
     
     ITHotKey *hotKey;
     ITDebugLog(@"Setting up hot keys.");
     

-    if (playerRunningState == ITMTRemotePlayerNotRunning) {
+    if (playerRunningState == ITMTRemotePlayerNotRunning && ![[NetworkController sharedController] isConnectedToServer]) {

         return;
     }
     
         return;
     }