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

Fixed up fading logic.

CQTexperiment
vspader 2009-02-28 13:19:26 -08:00
parent fd4fa4c62d
commit 1fcf3bb2ff
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Application/PlaybackController.h
View File

@ -30,6 +30,7 @@
int playbackStatus; int playbackStatus;
double position; double position;
BOOL seekable; BOOL seekable;
BOOL fading;
AudioScrobbler *scrobbler; AudioScrobbler *scrobbler;

15
Application/PlaybackController.m
View File

@ -25,6 +25,9 @@
{ {
[self initDefaults]; [self initDefaults];
seekable = NO;
fading = NO;
audioPlayer = [[AudioPlayer alloc] init]; audioPlayer = [[AudioPlayer alloc] init];
[audioPlayer setDelegate:self]; [audioPlayer setDelegate:self];
[self setPlaybackStatus: kCogStatusStopped]; [self setPlaybackStatus: kCogStatusStopped];
@ -276,7 +279,8 @@
[audioPlayer setVolume:originalVolume]; [audioPlayer setVolume:originalVolume];
[volumeSlider setDoubleValue: logarithmicToLinear(originalVolume)]; [volumeSlider setDoubleValue: logarithmicToLinear(originalVolume)];
[audioTimer invalidate]; [audioTimer invalidate];
[self setPlaybackStatus: kCogStatusPaused];
fading = NO;
} }
} }
@ -300,7 +304,8 @@
{ {
[volumeSlider setDoubleValue: logarithmicToLinear(originalVolume)]; [volumeSlider setDoubleValue: logarithmicToLinear(originalVolume)];
[audioTimer invalidate]; [audioTimer invalidate];
[self setPlaybackStatus: kCogStatusPlaying];
fading = NO;
} }
} }
@ -310,8 +315,9 @@
double time = 0.1; double time = 0.1;
// we can not allow multiple fade timers to be registered // we can not allow multiple fade timers to be registered
if (playbackStatus == kCogStatusFading) if (YES == fading)
return; return;
fading = YES;
NSNumber *originalVolume = [NSNumber numberWithDouble: [audioPlayer volume]]; NSNumber *originalVolume = [NSNumber numberWithDouble: [audioPlayer volume]];
NSTimer *fadeTimer; NSTimer *fadeTimer;
@ -335,9 +341,6 @@
[[NSRunLoop currentRunLoop] addTimer:fadeTimer forMode:NSRunLoopCommonModes]; [[NSRunLoop currentRunLoop] addTimer:fadeTimer forMode:NSRunLoopCommonModes];
[self pauseResume:self]; [self pauseResume:self];
} }
[self setPlaybackStatus: kCogStatusFading];
} }
- (IBAction)skipToNextAlbum:(id)sender - (IBAction)skipToNextAlbum:(id)sender

4
Audio/Status.h
View File

@ -12,8 +12,4 @@ enum
kCogStatusStopped = 0, kCogStatusStopped = 0,
kCogStatusPaused, kCogStatusPaused,
kCogStatusPlaying, kCogStatusPlaying,
kCogStatusFading,
// kCogStatusEndOfFile,
// kCogStatusEndOfPlaylist,
// kCogStatusPlaybackEnded
}; };

2
Window/PlaybackButtons.m
View File

@ -45,7 +45,7 @@ static NSString *PlaybackButtonsPlaybackStatusObservationContext = @"PlaybackBut
NSImage *image = nil; NSImage *image = nil;
if (playbackStatus == kCogStatusPlaying || playbackStatus == kCogStatusFading) { if (playbackStatus == kCogStatusPlaying) {
image = [NSImage imageNamed:@"pause"]; image = [NSImage imageNamed:@"pause"];
} }
else { else {