3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-08-03 16:48:52 +02:00
Code Issues Projects Releases Packages Wiki Activity

code review changes pt2: cleaned up cmake, removed unused addUs function and windows macro from time_defs.hpp

Browse source
This commit is contained in:
Stijn Van der Borght 2020-04-07 21:07:24 +01:00 • committed by Johannes Pohl
parent 463f28008b
commit 1fcb8b4fc2
8 changed files with 26 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

32
common/time_defs.hpp
View file

@ -28,24 +28,10 @@
#ifndef WINDOWS
#include <sys/time.h>
#else // from the GNU C library implementation of sys/time.h
#else
#include <Windows.h>
#include <stdint.h>
#include <winsock2.h>
#define timersub(a, b, result) \
do \
{ \
(result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
(result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
if ((result)->tv_usec < 0) \
{ \
--(result)->tv_sec; \
(result)->tv_usec += 1000000; \
} \
} while (0)
#define CLOCK_MONOTONIC 42 // discarded on windows plaforms
#endif
namespace chronos
@ -120,22 +106,6 @@ inline ToDuration diff(const timeval& tv1, const timeval& tv2)
return std::chrono::duration_cast<ToDuration>(std::chrono::seconds(sec) + std::chrono::microseconds(usec));
}
inline static void addUs(timeval& tv, int us)
{
if (us < 0)
{
timeval t;
t.tv_sec = -us / 1000000;
t.tv_usec = (-us % 1000000);
timersub(&tv, &t, &tv);
return;
}
tv.tv_usec += us;
tv.tv_sec += (tv.tv_usec / 1000000);
tv.tv_usec %= 1000000;
}
inline static long getTickCount()
{
#if defined (MACOS)