From e5f064a01f2b24e33cd86c13f0f67368a04a70b3 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@d8a302eb-03bc-478d-80e4-98257eca68ef> Date: Sun, 28 Sep 2014 07:45:17 +0000 Subject: [PATCH] time stuff git-svn-id: svn://elaine/murooma/trunk@303 d8a302eb-03bc-478d-80e4-98257eca68ef --- server/controlServer.h | 1 - server/snapServer.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/controlServer.h b/server/controlServer.h index 8454c5c2..3fb507b0 100644 --- a/server/controlServer.h +++ b/server/controlServer.h @@ -10,7 +10,6 @@ #include #include "serverSession.h" -#include "common/timeUtils.h" #include "common/queue.h" #include "message/message.h" #include "message/headerMessage.h" diff --git a/server/snapServer.cpp b/server/snapServer.cpp index 8731c0f4..e5901c74 100644 --- a/server/snapServer.cpp +++ b/server/snapServer.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "common/timeUtils.h" +#include "common/timeDefs.h" #include "common/signalHandler.h" #include "common/utils.h" #include "message/sampleFormat.h" @@ -128,7 +128,7 @@ int main(int argc, char* argv[]) if (nextTick > currentTick) { usleep((nextTick - currentTick) * 1000); - } + } else { gettimeofday(&tvChunk, NULL);