eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bug fix

Browse source
This commit is contained in:
Volker Fischer 2013-03-04 16:11:37 +00:00
parent 9abc744a60
commit 3c790d28df
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/server.cpp
View file

@ -118,8 +118,7 @@ CHighPrecisionTimer::CHighPrecisionTimer() :
(uint64_t) timeBaseInfo.numer;
#else
// set delay
Delay.tv_sec = 0;
Delay.tv_nsec = iNsDelay;
Delay = iNsDelay;
#endif
}
@ -133,12 +132,16 @@ void CHighPrecisionTimer::Start()
// set initial end time
#if defined ( __APPLE__ ) || defined ( __MACOSX )
NextEnd = mach_absolute_time();
NextEnd += Delay;
NextEnd = mach_absolute_time() + Delay;
#else
clock_gettime ( CLOCK_MONOTONIC, &NextEnd );
NextEnd.tv_sec += Delay.tv_sec;
NextEnd.tv_nsec += Delay.tv_nsec;
NextEnd.tv_nsec += Delay;
if ( NextEnd.tv_nsec >= 1000000000L )
{
NextEnd.tv_sec++;
NextEnd.tv_nsec -= 1000000000L;
}
#endif
// start thread
@ -176,8 +179,12 @@ void CHighPrecisionTimer::run()
&NextEnd,
NULL );
NextEnd.tv_sec += Delay.tv_sec;
NextEnd.tv_nsec += Delay.tv_nsec;
NextEnd.tv_nsec += Delay;
if ( NextEnd.tv_nsec >= 1000000000L )
{
NextEnd.tv_sec++;
NextEnd.tv_nsec -= 1000000000L;
}
#endif
}
}

2
src/server.h
View file

@ -100,7 +100,7 @@ protected:
uint64_t Delay;
uint64_t NextEnd;
#else
timespec Delay;
long Delay;
timespec NextEnd;
#endif