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

send timesync in a semiduplex fashion

Browse source
This commit is contained in:
badaix 2015-08-17 19:55:30 +02:00
parent 94e6511e56
commit 74dab4ca10
2 changed files with 37 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

38
client/controller.cpp
View file

@ -36,7 +36,7 @@
using namespace std; using namespace std;
Controller::Controller() : MessageReceiver(), active_(false), sampleFormat_(NULL), decoder_(NULL) Controller::Controller() : MessageReceiver(), active_(false), sampleFormat_(NULL), decoder_(NULL), sendTimeSyncMsg_(false), asyncException_(false)
{ {
} }
@ -44,6 +44,8 @@ Controller::Controller() : MessageReceiver(), active_(false), sampleFormat_(NULL
void Controller::onException(ClientConnection* connection, const std::exception& exception) void Controller::onException(ClientConnection* connection, const std::exception& exception)
{ {
logE << "onException: " << exception.what() << "\n"; logE << "onException: " << exception.what() << "\n";
exception_ = exception;
asyncException_ = true;
} }
@ -66,6 +68,22 @@ void Controller::onMessageReceived(ClientConnection* connection, const msg::Base
delete pcmChunk; delete pcmChunk;
} }
} }
else if (baseMessage.type == message_type::kTime)
{
msg::Time reply;
reply.deserialize(baseMessage, buffer);
double latency = (reply.received.sec - reply.sent.sec) + (reply.received.usec - reply.sent.usec) / 1000000.;
// logO << "diff to server [ms]: " << (float)TimeProvider::getInstance().getDiffToServer<chronos::usec>().count() / 1000.f << "\n";
// logO << "timeMsg: " << latency << "\n";
TimeProvider::getInstance().setDiffToServer((reply.latency - latency) * 1000 / 2);
}
if (sendTimeSyncMsg_)
{
msg::Request timeReq(kTime);
clientConnection_->send(&timeReq);
sendTimeSyncMsg_ = false;
}
} }
@ -147,17 +165,25 @@ void Controller::worker()
while (active_) while (active_)
{ {
usleep(500*1000); for (size_t n=0; n<10 && active_; ++n)
shared_ptr<msg::Time> reply = clientConnection_->sendReq<msg::Time>(&timeReq);
if (reply)
{ {
double latency = (reply->received.sec - reply->sent.sec) + (reply->received.usec - reply->sent.usec) / 1000000.; usleep(100*1000);
TimeProvider::getInstance().setDiffToServer((reply->latency - latency) * 1000 / 2); if (asyncException_)
throw exception_;
} }
sendTimeSyncMsg_ = true;
// shared_ptr<msg::Time> reply = clientConnection_->sendReq<msg::Time>(&timeReq);
// 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);
// }
} }
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
asyncException_ = false;
logS(kLogErr) << "Exception in Controller::worker(): " << e.what() << endl; logS(kLogErr) << "Exception in Controller::worker(): " << e.what() << endl;
logO << "Stopping clientConnection" << endl; logO << "Stopping clientConnection" << endl;
clientConnection_->stop(); clientConnection_->stop();

3
client/controller.h
View file

@ -60,6 +60,9 @@ private:
Decoder* decoder_; Decoder* decoder_;
PcmDevice pcmDevice_; PcmDevice pcmDevice_;
size_t latency_; size_t latency_;
bool sendTimeSyncMsg_;
std::exception exception_;
bool asyncException_;
}; };