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

bug fix

Browse source 
git-svn-id: svn://elaine/murooma/trunk@333 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-12-30 09:49:13 +00:00
parent b26952f5d1
commit 225fdc339a
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/controller.cpp
View file

@ -8,6 +8,7 @@
#include "alsaPlayer.h" #include "alsaPlayer.h"
#include "timeProvider.h" #include "timeProvider.h"
#include "common/log.h" #include "common/log.h"
#include "common/snapException.h"
#include "message/serverSettings.h" #include "message/serverSettings.h"
#include "message/time.h" #include "message/time.h"
#include "message/request.h" #include "message/request.h"
@ -127,28 +128,28 @@ void Controller::worker()
while (active_) while (active_)
{ {
usleep(500*1000); usleep(500*1000);
//throw SnapException("timeout");
shared_ptr<msg::Time> reply = clientConnection->sendReq<msg::Time>(&timeReq); shared_ptr<msg::Time> reply = clientConnection->sendReq<msg::Time>(&timeReq);
if (reply) if (reply)
{ {
double latency = (reply->received.sec - reply->sent.sec) + (reply->received.usec - reply->sent.usec) / 1000000.; double latency = (reply->received.sec - reply->sent.sec) + (reply->received.usec - reply->sent.usec) / 1000000.;
TimeProvider::getInstance().setDiffToServer((reply->latency - latency) * 1000 / 2); TimeProvider::getInstance().setDiffToServer((reply->latency - latency) * 1000 / 2);
} }
//throw std::exception();
} }
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
logS(kLogErr) << "Exception in Controller::worker(): " << e.what() << endl; logS(kLogErr) << "Exception in Controller::worker(): " << e.what() << endl;
logD << "Deleting stream\n"; logO << "Stopping clientConnection" << endl;
clientConnection->stop();
logO << "Deleting stream" << endl;
if (stream != NULL) if (stream != NULL)
delete stream; delete stream;
stream = NULL; stream = NULL;
if (decoder != NULL) if (decoder != NULL)
delete decoder; delete decoder;
decoder = NULL; decoder = NULL;
logD << "Stopping clientConnection\n"; logO << "done" << endl;
clientConnection->stop();
logD << "done\n";
if (active_) if (active_)
usleep(500*1000); usleep(500*1000);
} }