smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-19 11:55:58 +01:00
Code Issues Projects Releases Wiki Activity

and one more gettimeofday() transition (mackie timers)

Browse source
This commit is contained in:
Robin Gareus 2014-05-16 18:35:42 +02:00 • committed by Paul Davis
parent 69ca902e23
commit c31c15eeaa
1 changed files with 8 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

51
libs/surfaces/mackie/timer.h
View file

@ -50,17 +50,8 @@ public:
*/
unsigned long start()
{
#ifdef _WIN32
_start = (unsigned long)::GetTickCount();
#else
gettimeofday ( &_start, 0 );
#endif
running = true;
#ifdef _WIN32
return _start;
#else
return ( _start.tv_sec * 1000000 + _start.tv_usec ) / 1000;
#endif
_start = g_get_monotonic_time();
return _start / 1000;
}
/**
@ -69,12 +60,7 @@ public:
*/
unsigned long stop()
{
#ifdef _WIN32
_stop = (unsigned long)::GetTickCount();
#else
gettimeofday ( &_stop, 0 );
#endif
running = false;
_stop = g_get_monotonic_time();
return elapsed();
}
@ -85,28 +71,12 @@ public:
{
if ( running )
{
#ifdef _WIN32
DWORD current = ::GetTickCount();
return current - _start;
#else
struct timeval current;
gettimeofday ( &current, 0 );
return (
( current.tv_sec * 1000000 + current.tv_usec ) - ( _start.tv_sec * 1000000 + _start.tv_usec )
) / 1000
;
#endif
uint64_t now = g_get_monotonic_time();
return (now - _start) / 1000;
}
else
{
#ifdef _WIN32
return _stop - _start;
#else
return (
( _stop.tv_sec * 1000000 + _stop.tv_usec ) - ( _start.tv_sec * 1000000 + _start.tv_usec )
) / 1000
;
#endif
return (_stop - _start) / 1000;
}
}
@ -121,13 +91,8 @@ public:
}
private:
#ifdef _WIN32
unsigned long _start;
unsigned long _stop;
#else
struct timeval _start;
struct timeval _stop;
#endif
uint64_t _start;
uint64_t _stop;
bool running;
};