kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed up timers so they are still in effect while in the tracking runloop mode.

CQTexperiment
vspader 2009-02-09 06:16:16 +00:00
parent f9c9bfad18
commit f24afa4c86
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Application/PlaybackController.m
View File

@ -325,20 +325,23 @@
NSNumber *originalVolume = [NSNumber numberWithDouble: [audioPlayer volume]]; NSNumber *originalVolume = [NSNumber numberWithDouble: [audioPlayer volume]];
NSTimer *fadeTimer; NSTimer *fadeTimer;
if (playbackStatus == kCogStatusPlaying) if (playbackStatus == kCogStatusPlaying) {
fadeTimer = [NSTimer scheduledTimerWithTimeInterval:time fadeTimer = [NSTimer timerWithTimeInterval:time
target:self target:self
selector:@selector(audioFadeDown:) selector:@selector(audioFadeDown:)
userInfo:originalVolume userInfo:originalVolume
repeats:YES]; repeats:YES];
[[NSRunLoop currentRunLoop] addTimer:fadeTimer forMode:NSRunLoopCommonModes];
}
else else
{ {
[audioPlayer setVolume:0]; [audioPlayer setVolume:0];
fadeTimer = [NSTimer scheduledTimerWithTimeInterval:time fadeTimer = [NSTimer timerWithTimeInterval:time
target:self target:self
selector:@selector(audioFadeUp:) selector:@selector(audioFadeUp:)
userInfo:originalVolume userInfo:originalVolume
repeats:YES]; repeats:YES];
[[NSRunLoop currentRunLoop] addTimer:fadeTimer forMode:NSRunLoopCommonModes];
[self pauseResume:self]; [self pauseResume:self];
} }
@ -552,8 +555,10 @@
} }
else if (status == kCogStatusPlaying) else if (status == kCogStatusPlaying)
{ {
if (!positionTimer) if (!positionTimer) {
positionTimer = [NSTimer scheduledTimerWithTimeInterval:1.00 target:self selector:@selector(updatePosition:) userInfo:nil repeats:YES]; positionTimer = [NSTimer timerWithTimeInterval:1.00 target:self selector:@selector(updatePosition:) userInfo:nil repeats:YES];
[[NSRunLoop currentRunLoop] addTimer:positionTimer forMode:NSRunLoopCommonModes];
}
//Show pause //Show pause
[self changePlayButtonImage:@"pause"]; [self changePlayButtonImage:@"pause"];

4
ThirdParty/GCWindowMenu/GCWindowMenu.m vendored
View File

@ -284,12 +284,12 @@
mask = NSLeftMouseUpMask | NSLeftMouseDraggedMask | mask = NSLeftMouseUpMask | NSLeftMouseDraggedMask |
NSRightMouseUpMask | NSRightMouseDraggedMask | NSRightMouseUpMask | NSRightMouseDraggedMask |
NSAppKitDefinedMask | NSFlagsChangedMask | NSAppKitDefinedMask | NSFlagsChangedMask |
NSScrollWheelMask; NSScrollWheelMask | NSPeriodicMask;
while (keepOn) while (keepOn)
{ {
theEvent = [self transmogrify:[self nextEventMatchingMask:mask]]; theEvent = [self transmogrify:[self nextEventMatchingMask:mask]];
NSLog(@"Event: %@", theEvent);
switch ([theEvent type]) switch ([theEvent type])
{ {
case NSMouseMoved: case NSMouseMoved:

3
ThirdParty/ToolTip/ToolTipWindow.m vendored
View File

@ -103,7 +103,8 @@
if (closeTimer) { [closeTimer invalidate]; [closeTimer release]; } 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 - (void)orderFront