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

pcmDevice and chronos in stream

Browse source 
git-svn-id: svn://elaine/murooma/trunk@298 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-09-27 12:13:47 +00:00
parent fe79a78efe
commit d0c07e3b67
13 changed files with 239 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/controller.cpp
View file

@ -47,9 +47,10 @@ void Controller::onMessageReceived(ClientConnection* connection, const BaseMessa
}
void Controller::start(const std::string& _ip, size_t _port)
void Controller::start(const PcmDevice& pcmDevice, const std::string& _ip, size_t _port)
{
ip = _ip;
pcmDevice_ = pcmDevice;
clientConnection = new ClientConnection(this, ip, _port);
controllerThread = new thread(&Controller::worker, this);
}
@ -92,25 +93,22 @@ void Controller::worker()
decoder->setHeader(headerChunk.get());
RequestMsg timeReq("time");
for (size_t n=0; n<30; ++n)
for (size_t n=0; n<50; ++n)
{
shared_ptr<TimeMsg> reply = clientConnection->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);
/*cout << TimeProvider::sinceEpoche<chronos::usec>(chronos::hrc::now()).count() << "\n";
cout << TimeProvider::sinceEpoche<chronos::msec>(TimeProvider::now()).count() << "\n";
cout << TimeProvider::sinceEpoche<chronos::msec>(TimeProvider::serverNow()).count() << "\n";
cout << "Received: " << TimeProvider::sinceEpoche<chronos::msec>(TimeProvider::toTimePoint(reply->received)).count() << "\n\n";
*/ usleep(1000);
usleep(1000);
}
}
cout << "diff to server [ms]: " << TimeProvider::getInstance().getDiffToServer<chronos::msec>().count() << "\n";
stream = new Stream(*sampleFormat);
stream->setBufferLen(serverSettings->bufferMs);
Player player(stream);
Player player(pcmDevice_, stream);
player.start();
RequestMsg startStream("startStream");