From f24afa4c864fca0020038f695b17a017fd20dd33 Mon Sep 17 00:00:00 2001
From: vspader <unknown>
Date: Mon, 9 Feb 2009 06:16:16 +0000
Subject: [PATCH] Fixed up timers so they are still in effect while in the
 tracking runloop mode.

---
 Application/PlaybackController.m       | 15 ++++++++++-----
 ThirdParty/GCWindowMenu/GCWindowMenu.m |  4 ++--
 ThirdParty/ToolTip/ToolTipWindow.m     |  3 ++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Application/PlaybackController.m b/Application/PlaybackController.m
index ddad96d99..5e8bc5a9f 100644
--- a/Application/PlaybackController.m
+++ b/Application/PlaybackController.m
@@ -325,20 +325,23 @@
 	NSNumber  *originalVolume = [NSNumber numberWithDouble: [audioPlayer volume]];
 	NSTimer   *fadeTimer;
 	
-	if (playbackStatus == kCogStatusPlaying)
-		fadeTimer = [NSTimer scheduledTimerWithTimeInterval:time
+	if (playbackStatus == kCogStatusPlaying) {
+		fadeTimer = [NSTimer timerWithTimeInterval:time
 												 target:self
 											   selector:@selector(audioFadeDown:) 
 											   userInfo:originalVolume
 												repeats:YES];
+		[[NSRunLoop currentRunLoop] addTimer:fadeTimer forMode:NSRunLoopCommonModes];
+	}
 	else
 	{
 		[audioPlayer setVolume:0];
-		fadeTimer = [NSTimer scheduledTimerWithTimeInterval:time
+		fadeTimer = [NSTimer timerWithTimeInterval:time
 													 target:self
 												   selector:@selector(audioFadeUp:) 
 												   userInfo:originalVolume
 													repeats:YES];
+		[[NSRunLoop currentRunLoop] addTimer:fadeTimer forMode:NSRunLoopCommonModes];
 		[self pauseResume:self];
 	}
 
@@ -552,8 +555,10 @@
 	}
 	else if (status == kCogStatusPlaying)
 	{
-		if (!positionTimer)
-			positionTimer = [NSTimer scheduledTimerWithTimeInterval:1.00 target:self selector:@selector(updatePosition:) userInfo:nil repeats:YES];
+		if (!positionTimer) {
+			positionTimer = [NSTimer timerWithTimeInterval:1.00 target:self selector:@selector(updatePosition:) userInfo:nil repeats:YES];
+			[[NSRunLoop currentRunLoop] addTimer:positionTimer forMode:NSRunLoopCommonModes];
+		}
 
 		//Show pause
 		[self changePlayButtonImage:@"pause"];
diff --git a/ThirdParty/GCWindowMenu/GCWindowMenu.m b/ThirdParty/GCWindowMenu/GCWindowMenu.m
index 8f9831bbc..6a27acbc1 100644
--- a/ThirdParty/GCWindowMenu/GCWindowMenu.m
+++ b/ThirdParty/GCWindowMenu/GCWindowMenu.m
@@ -284,12 +284,12 @@
 	mask = NSLeftMouseUpMask | NSLeftMouseDraggedMask |
 			NSRightMouseUpMask | NSRightMouseDraggedMask |
 			NSAppKitDefinedMask | NSFlagsChangedMask |
-			NSScrollWheelMask;
+			NSScrollWheelMask | NSPeriodicMask;
  
 	while (keepOn)
 	{
 		theEvent = [self transmogrify:[self nextEventMatchingMask:mask]];
-
+		NSLog(@"Event: %@", theEvent);
 		switch ([theEvent type])
 		{
 			case NSMouseMoved:
diff --git a/ThirdParty/ToolTip/ToolTipWindow.m b/ThirdParty/ToolTip/ToolTipWindow.m
index 25fd7548c..5c3febec4 100644
--- a/ThirdParty/ToolTip/ToolTipWindow.m
+++ b/ThirdParty/ToolTip/ToolTipWindow.m
@@ -103,7 +103,8 @@
 
     if (closeTimer) { [closeTimer invalidate]; [closeTimer release]; }
 	
-    closeTimer = [[NSTimer scheduledTimerWithTimeInterval:duration target:self selector:@selector(close) userInfo:nil repeats:NO] retain];
+    closeTimer = [[NSTimer timerWithTimeInterval:duration target:self selector:@selector(close) userInfo:nil repeats:NO] retain];
+	[[NSRunLoop currentRunLoop] addTimer:closeTimer forMode:NSRunLoopCommonModes];
 }
 
 - (void)orderFront