From: Kent Sutherland <ksuther@ithinksw.com>
Date: Sun, 29 May 2005 07:01:40 +0000 (+0000)
Subject: Added a small main menu to allow command-keys to work in the registration window... 
X-Git-Tag: v1.6~15
X-Git-Url: http://git.ithinksw.org/MenuTunes.git/commitdiff_plain/0e96faf46397725b657c4947d13cd31fa75aa170

Added a small main menu to allow command-keys to work in the registration window and the prefs window.
Checks iTunes version at startup to avoid starting the polling timer if it isn't needed.
---

diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib
index adeae52..20f1589 100755
--- a/English.lproj/MainMenu.nib/info.nib
+++ b/English.lproj/MainMenu.nib/info.nib
@@ -2,9 +2,20 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>IBDocumentLocation</key>
+	<string>69 53 356 240 0 0 1152 746 </string>
+	<key>IBEditorPositions</key>
+	<dict>
+		<key>200</key>
+		<string>69 298 222 44 0 0 1152 746 </string>
+	</dict>
 	<key>IBFramework Version</key>
-	<string>291.0</string>
+	<string>437.0</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>200</integer>
+	</array>
 	<key>IBSystem Version</key>
-	<string>6I32</string>
+	<string>8B15</string>
 </dict>
 </plist>
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index d50a1fb..446609c 100755
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/MainController.h b/MainController.h
index 86efb71..027db07 100755
--- a/MainController.h
+++ b/MainController.h
@@ -44,7 +44,7 @@
     
     MTBlingController *bling;
     NSTimer *registerTimer;
-    BOOL timerUpdating, _checkingForServer, _popped, _open;
+    BOOL timerUpdating, _checkingForServer, _popped, _open, _needsPolling;
     BOOL blinged;
     NSLock *_serverCheckLock;
 }
diff --git a/MainController.m b/MainController.m
index c2502c5..2a3d6b3 100755
--- a/MainController.m
+++ b/MainController.m
@@ -98,11 +98,28 @@ static MainController *sharedController;
 
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
+	NSString *iTunesPath = [df stringForKey:@"CustomPlayerPath"];
+	NSDictionary *iTunesInfoPlist;
+	float iTunesVersion;
+	
     //Turn on debug mode if needed
     if ([df boolForKey:@"ITDebugMode"]) {
         SetITDebugMode(YES);
     }
-    
+
+	//Check if iTunes 4.7 or later is installed	
+	if (!iTunesPath) {
+		iTunesPath = [[NSWorkspace sharedWorkspace] fullPathForApplication:@"iTunes.app"];
+	}
+	iTunesInfoPlist = [[NSBundle bundleWithPath:iTunesPath] infoDictionary];
+	iTunesVersion = [[iTunesInfoPlist objectForKey:@"CFBundleVersion"] floatValue];
+	ITDebugLog(@"iTunes version found: %f.", iTunesVersion);
+	if (iTunesVersion >= 4.7) {
+		_needsPolling = NO;
+	} else {
+		_needsPolling = YES;
+	}
+	
     if (([df integerForKey:@"appVersion"] < 1200) && ([df integerForKey:@"SongsInAdvance"] > 0)) {
         [df removePersistentDomainForName:@"com.ithinksw.menutunes"];
         [df synchronize];
@@ -301,7 +318,7 @@ static MainController *sharedController;
         if (blinged) {
             [statusItem setEnabled:YES];
             [[ITHotKeyCenter sharedCenter] setEnabled:YES];
-            if (![refreshTimer isValid]) {
+            if (_needsPolling && ![refreshTimer isValid]) {
                 [refreshTimer release];
                 refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
                              target:self
@@ -489,12 +506,12 @@ static MainController *sharedController;
 - (void)trackChanged:(NSNotification *)note
 {
 	//If we're running the timer, shut it off since we don't need it!
-	if (refreshTimer && [refreshTimer isValid]) {
+	/*if (refreshTimer && [refreshTimer isValid]) {
 		ITDebugLog(@"Invalidating refresh timer.");
 		[refreshTimer invalidate];
 		[refreshTimer release];
 		refreshTimer = nil;
-	}
+	}*/
 	
 	if (![self songChanged]) {
 		return;
@@ -992,7 +1009,7 @@ static MainController *sharedController;
     NSImage                *art         = nil;
     int                     rating      = -1;
     int                     playCount   = -1;
-    
+	
     ITDebugLog(@"Showing track info status window.");
     
     NS_DURING
@@ -1344,14 +1361,16 @@ static MainController *sharedController;
         [self setupHotKeys];
         //playerRunningState = ITMTRemotePlayerRunning;
         playerRunningState = [[self currentRemote] playerRunningState];
-		if (refreshTimer) {
-			[refreshTimer invalidate];
+		if (_needsPolling) {
+			if (refreshTimer) {
+				[refreshTimer invalidate];
+			}
+			refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
+									 target:self
+									 selector:@selector(timerUpdate)
+									 userInfo:nil
+									 repeats:YES] retain];
 		}
-        refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
-                                target:self
-                                selector:@selector(timerUpdate)
-                                userInfo:nil
-                                repeats:YES] retain];
         [self timerUpdate];
         ITDebugLog(@"Connection successful.");
         return 1;
@@ -1487,11 +1506,13 @@ static MainController *sharedController;
             [[self currentRemote] begin];
             [self setLatestSongIdentifier:@""];
             [self timerUpdate];
-            refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
-                                target:self
-                                selector:@selector(timerUpdate)
-                                userInfo:nil
-                                repeats:YES] retain];
+			if (_needsPolling) {
+				refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:([networkController isConnectedToServer] ? 10.0 : 0.5)
+									target:self
+									selector:@selector(timerUpdate)
+									userInfo:nil
+									repeats:YES] retain];
+			}
             //[NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
 			if (![df boolForKey:@"UsePollingOnly"]) {
 				[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(trackChanged:) name:@"ITMTTrackChanged" object:nil];