Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2015-08-30 02:56:09 -07:00
committed by Lionel Sambuc
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
audio/milkytracker/patches/patch-src_tracker_TrackerStartup.cpp
View File

@@ -1,12 +1,31 @@
$NetBSD: patch-src_tracker_TrackerStartup.cpp,v 1.1 2014/01/02 06:45:48 dholland Exp $
$NetBSD: patch-src_tracker_TrackerStartup.cpp,v 1.2 2015/06/25 06:01:01 dholland Exp $
Taking the absolute value of the difference of two values doesn't work
if the difference is unsigned. Do something else semi-reasonable
instead for the case when the clock goes backwards.
--- src/tracker/TrackerStartUp.cpp~ 2008-02-23 16:32:45.000000000 +0000
--- src/tracker/TrackerStartUp.cpp.orig 2013-11-09 00:12:01.000000000 +0000
+++ src/tracker/TrackerStartUp.cpp
@@ -134,14 +134,16 @@ void Tracker::hideSplash()
@@ -119,14 +119,16 @@ void Tracker::showSplash()
pp_int32 deltaT = 100;
while (shade <= 256.0f)
{
- pp_int32 startTime = ::PPGetTickCount();
+ pp_uint32 startTime = ::PPGetTickCount();
#if defined(__EXCLUDE_BIGLOGO__) || defined(__LOWRES__)
screen->paintSplash(LogoSmall::rawData, LogoSmall::width, LogoSmall::height, LogoSmall::width*4, 4, (int)shade);
#else
screen->paintSplash(LogoBig::rawData, LogoBig::width, LogoBig::height, LogoBig::width*3, 3, (int)shade);
#endif
shade+=deltaT * (1.0f/6.25f);
- deltaT = abs(::PPGetTickCount() - startTime);
+ pp_uint32 nowTime = ::PPGetTickCount();
+ /* just in case the clock goes backwards */
+ deltaT = nowTime > startTime ? nowTime - startTime : 0;
if (!deltaT) deltaT++;
}
#if defined(__EXCLUDE_BIGLOGO__) || defined(__LOWRES__)
@@ -150,14 +152,16 @@ void Tracker::hideSplash()
pp_int32 deltaT = 100;
while (shade >= 0.0f)
{