chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Fading: Hopefully fix fading being broken after fading in once, possibly a rounding error that depends on the volume level set before fading in

Browse source
This commit is contained in:
Christopher Snowhill 2021-11-17 21:12:25 -08:00
parent d8dcb75ec6
commit 91bd653b55
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Application/PlaybackController.m
View file

@ -359,15 +359,16 @@ NSDictionary * makeRGInfo(PlaylistEntry *pe)
DLog(@"VOLUME IS %lf", volume); DLog(@"VOLUME IS %lf", volume);
if (volume < originalVolume) if (originalVolume - volume > 0.0001)
{ {
if ((volume + up) > originalVolume) if ((volume + up) > originalVolume)
[audioPlayer volumeUp:(originalVolume - volume)]; [audioPlayer volumeUp:(originalVolume - volume)];
else else
[audioPlayer volumeUp:up]; [audioPlayer volumeUp:up];
} }
else // volume is at 0 or below, we are ready to release the timer and move on else // volume is at or near original level, we are ready to release the timer and move on
{ {
[audioPlayer setVolume:originalVolume];
[volumeSlider setDoubleValue: logarithmicToLinear(originalVolume)]; [volumeSlider setDoubleValue: logarithmicToLinear(originalVolume)];
[audioTimer invalidate]; [audioTimer invalidate];