From 19bd1961d4ab59b8ff81a26ba4b31c12a1129417 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@d8a302eb-03bc-478d-80e4-98257eca68ef> Date: Fri, 27 Jun 2014 16:45:15 +0000 Subject: [PATCH] xxx git-svn-id: svn://elaine/murooma/trunk@17 d8a302eb-03bc-478d-80e4-98257eca68ef --- client.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/client.cpp b/client.cpp index 59156f4d..77056396 100644 --- a/client.cpp +++ b/client.cpp @@ -16,8 +16,10 @@ #include #include +const size_t ms(50); //44100 / 20 = 2205 -const size_t size(4*2205); +const size_t size(44100*4*ms/1000); + struct Chunk { @@ -45,6 +47,15 @@ std::string timeToStr(const timeval& timestamp) } +std::string chunkTime(const Chunk& chunk) +{ + timeval ts; + ts.tv_sec = chunk.tv_sec; + ts.tv_usec = chunk.tv_usec; + return timeToStr(ts); +} + + int diff_ms(const timeval& t1, const timeval& t2) { return (((t1.tv_sec - t2.tv_sec) * 1000000) + @@ -72,6 +83,7 @@ void player() if (chunks.empty()) cv.wait(lck); mutex.lock(); + std::cerr << "Chunks: " << chunks.size() << "\n"; Chunk* chunk = chunks.front(); chunks.pop_front(); mutex.unlock(); @@ -109,7 +121,9 @@ int main (int argc, char *argv[]) subscriber.recv(&update); Chunk* chunk = new Chunk(); memcpy(chunk, update.data(), sizeof(Chunk)); - std::cerr << "New chunk: " << getAge(*chunk) << "\n"; + timeval now; + gettimeofday(&now, NULL); + std::cerr << "New chunk: " << chunkTime(*chunk) << "\t" << timeToStr(now) << "\t" << getAge(*chunk) << "\n"; /* timeDiffs.push_back(diff_ms(now, ts)); if (timeDiffs.size() > 100)