mirror of
https://github.com/badaix/snapcast.git
synced 2025-08-03 16:48:52 +02:00
correction
git-svn-id: svn://elaine/murooma/trunk@86 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
parent
f418a144af
commit
1708157108
3 changed files with 48 additions and 26 deletions
30
timeUtils.h
30
timeUtils.h
|
@ -19,11 +19,26 @@ std::string timeToStr(const timeval& timestamp)
|
|||
|
||||
template <typename T>
|
||||
std::string chunkTime(const T& chunk)
|
||||
{
|
||||
return timeToStr(getTimeval(chunk));
|
||||
}
|
||||
|
||||
|
||||
template <typename T>
|
||||
timeval getTimeval(const T* chunk)
|
||||
{
|
||||
timeval ts;
|
||||
ts.tv_sec = chunk.tv_sec;
|
||||
ts.tv_usec = chunk.tv_usec;
|
||||
return timeToStr(ts);
|
||||
ts.tv_sec = chunk->tv_sec;
|
||||
ts.tv_usec = chunk->tv_usec;
|
||||
return ts;
|
||||
}
|
||||
|
||||
|
||||
template <typename T>
|
||||
void setTimeval(T* chunk, timeval tv)
|
||||
{
|
||||
chunk->tv_sec = tv.tv_sec;
|
||||
chunk->tv_usec = tv.tv_usec;
|
||||
}
|
||||
|
||||
|
||||
|
@ -39,10 +54,7 @@ long getAge(const T* chunk)
|
|||
{
|
||||
timeval now;
|
||||
gettimeofday(&now, NULL);
|
||||
timeval ts;
|
||||
ts.tv_sec = chunk->tv_sec;
|
||||
ts.tv_usec = chunk->tv_usec;
|
||||
return diff_ms(now, ts);
|
||||
return diff_ms(now, chunkTime(chunk));
|
||||
}
|
||||
|
||||
|
||||
|
@ -80,9 +92,7 @@ inline void addMs(timeval& tv, int ms)
|
|||
template <typename T>
|
||||
void addMs(T* chunk, int ms)
|
||||
{
|
||||
timeval tv;
|
||||
tv.tv_sec = chunk->tv_sec;
|
||||
tv.tv_usec = chunk->tv_usec;
|
||||
timeval tv = getTimeval(chunk);
|
||||
addMs(tv, ms);
|
||||
chunk->tv_sec = tv.tv_sec;
|
||||
chunk->tv_usec = tv.tv_usec;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue