mirror of
https://github.com/mackron/miniaudio.git
synced 2026-04-24 09:14:04 +02:00
Merge branch 'dev' into dev-0.12
This commit is contained in:
+4
-4
@@ -20151,7 +20151,7 @@ Timing
|
|||||||
struct timespec newTime;
|
struct timespec newTime;
|
||||||
clock_gettime(MA_CLOCK_ID, &newTime);
|
clock_gettime(MA_CLOCK_ID, &newTime);
|
||||||
|
|
||||||
pTimer->counter = (newTime.tv_sec * 1000000000) + newTime.tv_nsec;
|
pTimer->counter = ((ma_int64)newTime.tv_sec * 1000000000) + newTime.tv_nsec;
|
||||||
}
|
}
|
||||||
|
|
||||||
MA_API double ma_timer_get_time_in_seconds(ma_timer* pTimer)
|
MA_API double ma_timer_get_time_in_seconds(ma_timer* pTimer)
|
||||||
@@ -20162,7 +20162,7 @@ Timing
|
|||||||
struct timespec newTime;
|
struct timespec newTime;
|
||||||
clock_gettime(MA_CLOCK_ID, &newTime);
|
clock_gettime(MA_CLOCK_ID, &newTime);
|
||||||
|
|
||||||
newTimeCounter = (newTime.tv_sec * 1000000000) + newTime.tv_nsec;
|
newTimeCounter = ((ma_uint64)newTime.tv_sec * 1000000000) + newTime.tv_nsec;
|
||||||
oldTimeCounter = pTimer->counter;
|
oldTimeCounter = pTimer->counter;
|
||||||
|
|
||||||
return (newTimeCounter - oldTimeCounter) / 1000000000.0;
|
return (newTimeCounter - oldTimeCounter) / 1000000000.0;
|
||||||
@@ -20173,7 +20173,7 @@ Timing
|
|||||||
struct timeval newTime;
|
struct timeval newTime;
|
||||||
gettimeofday(&newTime, NULL);
|
gettimeofday(&newTime, NULL);
|
||||||
|
|
||||||
pTimer->counter = (newTime.tv_sec * 1000000) + newTime.tv_usec;
|
pTimer->counter = ((ma_int64)newTime.tv_sec * 1000000) + newTime.tv_usec;
|
||||||
}
|
}
|
||||||
|
|
||||||
MA_API double ma_timer_get_time_in_seconds(ma_timer* pTimer)
|
MA_API double ma_timer_get_time_in_seconds(ma_timer* pTimer)
|
||||||
@@ -20184,7 +20184,7 @@ Timing
|
|||||||
struct timeval newTime;
|
struct timeval newTime;
|
||||||
gettimeofday(&newTime, NULL);
|
gettimeofday(&newTime, NULL);
|
||||||
|
|
||||||
newTimeCounter = (newTime.tv_sec * 1000000) + newTime.tv_usec;
|
newTimeCounter = ((ma_uint64)newTime.tv_sec * 1000000) + newTime.tv_usec;
|
||||||
oldTimeCounter = pTimer->counter;
|
oldTimeCounter = pTimer->counter;
|
||||||
|
|
||||||
return (newTimeCounter - oldTimeCounter) / 1000000.0;
|
return (newTimeCounter - oldTimeCounter) / 1000000.0;
|
||||||
|
|||||||
Reference in New Issue
Block a user