3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-07-07 11:47:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

Codec in header message

Browse source 
git-svn-id: svn://elaine/murooma/trunk@286 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-09-21 10:37:14 +00:00
parent a833a00cb1
commit e0a6ac9467
9 changed files with 36 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

19
client/controller.cpp
View file

@ -83,14 +83,15 @@ void Controller::worker()
while (!(sampleFormat = clientConnection->sendReq<SampleFormat>(&requestMsg, 1000)));
cout << "SampleFormat rate: " << sampleFormat->rate << ", bits: " << sampleFormat->bits << ", channels: " << sampleFormat->channels << "\n";
decoder = new OggDecoder();
if (decoder != NULL)
{
requestMsg.request = "headerChunk";
shared_ptr<HeaderMessage> headerChunk(NULL);
while (!(headerChunk = clientConnection->sendReq<HeaderMessage>(&requestMsg, 1000)));
decoder->setHeader(headerChunk.get());
}
requestMsg.request = "headerChunk";
shared_ptr<HeaderMessage> headerChunk(NULL);
while (!(headerChunk = clientConnection->sendReq<HeaderMessage>(&requestMsg, 1000)));
cout << "Codec: " << headerChunk->codec << "\n";
if (headerChunk->codec == "ogg")
decoder = new OggDecoder();
else if (headerChunk->codec == "pcm")
decoder = new PcmDecoder();
decoder->setHeader(headerChunk.get());
RequestMsg timeReq("time");
for (size_t n=0; n<10; ++n)
@ -124,7 +125,7 @@ void Controller::worker()
{
double latency = (reply->received.sec - reply->sent.sec) + (reply->received.usec - reply->sent.usec) / 1000000.;
TimeProvider::getInstance().setDiffToServer((reply->latency - latency) * 1000 / 2);
cout << "Median: " << TimeProvider::getInstance().getDiffToServer() << "\n";
// cout << "Median: " << TimeProvider::getInstance().getDiffToServer() << "\n";
}
}
}