3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-20 12:36:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

time provider

Browse source 
git-svn-id: svn://elaine/murooma/trunk@268 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-09-16 05:20:16 +00:00
parent 19e77f0f20
commit 2fedce489c
6 changed files with 93 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
client/controller.cpp
View file

@ -6,6 +6,7 @@
#include "oggDecoder.h"
#include "pcmDecoder.h"
#include "player.h"
#include "timeProvider.h"
#include "common/serverSettings.h"
#include "common/timeMsg.h"
#include "common/requestMsg.h"
@ -104,6 +105,17 @@ void Controller::worker()
decoder->setHeader(headerChunk.get());
}
RequestMsg timeReq("time");
for (size_t n=0; n<10; ++n)
{
shared_ptr<TimeMsg> reply = controlConnection->sendReq<TimeMsg>(&timeReq, 2000);
if (reply)
{
double latency = (reply->received.sec - reply->sent.sec) + (reply->received.usec - reply->sent.usec) / 1000000.;
TimeProvider::getInstance().setDiffToServer((reply->latency - latency) * 1000 / 2);
usleep(1000);
}
}
streamClient->start();
stream = new Stream(*sampleFormat);
@ -112,21 +124,18 @@ void Controller::worker()
Player player(stream);
player.start();
DoubleBuffer<long> timeBuffer(100);
while (active_)
{
usleep(1000000);//1000000);
usleep(1000000);
try
{
RequestMsg requestMsg("time");
shared_ptr<TimeMsg> reply = controlConnection->sendReq<TimeMsg>(&requestMsg, 2000);
shared_ptr<TimeMsg> reply = controlConnection->sendReq<TimeMsg>(&timeReq, 2000);
if (reply)
{
//cout << "Reply: " << reply->message.type << ", size: " << reply->message.size << ", sent: " << reply->message.sent.sec << "," << reply->message.sent.usec << ", recv: " << reply->message.received.sec << "," << reply->message.received.usec << "\n";
double latency = (reply->received.sec - reply->sent.sec) + (reply->received.usec - reply->sent.usec) / 1000000.;
// cout << "C2S: " << timeMsg.latency << ", S2C: " << latency << ", diff: " << (timeMsg.latency - latency) / 2 << endl;
timeBuffer.add((reply->latency - latency) * 10000 / 2);
cout << timeBuffer.median() << "\n";
TimeProvider::getInstance().setDiffToServer((reply->latency - latency) * 1000 / 2);
cout << TimeProvider::getInstance().getDiffToServer() << "\n";
}
}
catch (const std::exception& e)