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

socket stuff

Browse source 
git-svn-id: svn://elaine/murooma/trunk@277 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-09-20 16:43:29 +00:00
parent 95964aa7b0
commit df77bdd8cb
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/controller.cpp
View file

@ -44,9 +44,7 @@ void Controller::start(const std::string& _ip, size_t _port, int _bufferMs)
{ {
bufferMs = _bufferMs; bufferMs = _bufferMs;
ip = _ip; ip = _ip;
clientConnection = new ClientConnection(this, ip, _port);
controlConnection = new ClientConnection(this, ip, _port);
controlConnection->start();
controllerThread = new thread(&Controller::worker, this); controllerThread = new thread(&Controller::worker, this);
} }
@ -66,15 +64,16 @@ void Controller::worker()
while (active_) while (active_)
{ {
clientConnection->start();
try try
{ {
RequestMsg requestMsg("serverSettings"); RequestMsg requestMsg("serverSettings");
shared_ptr<ServerSettings> serverSettings(NULL); shared_ptr<ServerSettings> serverSettings(NULL);
while (!(serverSettings = controlConnection->sendReq<ServerSettings>(&requestMsg, 1000))); while (!(serverSettings = clientConnection->sendReq<ServerSettings>(&requestMsg, 1000)));
cout << "ServerSettings port: " << serverSettings->port << "\n"; cout << "ServerSettings port: " << serverSettings->port << "\n";
requestMsg.request = "sampleFormat"; requestMsg.request = "sampleFormat";
while (!(sampleFormat = controlConnection->sendReq<SampleFormat>(&requestMsg, 1000))); while (!(sampleFormat = clientConnection->sendReq<SampleFormat>(&requestMsg, 1000)));
cout << "SampleFormat rate: " << sampleFormat->rate << ", bits: " << sampleFormat->bits << ", channels: " << sampleFormat->channels << "\n"; cout << "SampleFormat rate: " << sampleFormat->rate << ", bits: " << sampleFormat->bits << ", channels: " << sampleFormat->channels << "\n";
decoder = new OggDecoder(); decoder = new OggDecoder();
@ -82,14 +81,14 @@ void Controller::worker()
{ {
requestMsg.request = "headerChunk"; requestMsg.request = "headerChunk";
shared_ptr<HeaderMessage> headerChunk(NULL); shared_ptr<HeaderMessage> headerChunk(NULL);
while (!(headerChunk = controlConnection->sendReq<HeaderMessage>(&requestMsg, 1000))); while (!(headerChunk = clientConnection->sendReq<HeaderMessage>(&requestMsg, 1000)));
decoder->setHeader(headerChunk.get()); decoder->setHeader(headerChunk.get());
} }
RequestMsg timeReq("time"); RequestMsg timeReq("time");
for (size_t n=0; n<10; ++n) for (size_t n=0; n<10; ++n)
{ {
shared_ptr<TimeMsg> reply = controlConnection->sendReq<TimeMsg>(&timeReq, 2000); shared_ptr<TimeMsg> reply = clientConnection->sendReq<TimeMsg>(&timeReq, 2000);
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.;
@ -109,7 +108,7 @@ void Controller::worker()
while (active_) while (active_)
{ {
usleep(1000000); usleep(1000000);
shared_ptr<TimeMsg> reply = controlConnection->sendReq<TimeMsg>(&timeReq, 1000); shared_ptr<TimeMsg> reply = clientConnection->sendReq<TimeMsg>(&timeReq, 1000);
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.;

2
client/controller.h
View file

@ -21,7 +21,7 @@ private:
void worker(); void worker();
std::atomic<bool> active_; std::atomic<bool> active_;
std::thread* controllerThread; std::thread* controllerThread;
ClientConnection* controlConnection; ClientConnection* clientConnection;
Stream* stream; Stream* stream;
int bufferMs; int bufferMs;
std::string ip; std::string ip;

4
server/serverSession.cpp
View file

@ -65,13 +65,13 @@ bool ServerSession::send(BaseMessage* message)
void ServerSession::getNextMessage() void ServerSession::getNextMessage()
{ {
cout << "getNextMessage\n"; //cout << "getNextMessage\n";
BaseMessage baseMessage; BaseMessage baseMessage;
size_t baseMsgSize = baseMessage.getSize(); size_t baseMsgSize = baseMessage.getSize();
vector<char> buffer(baseMsgSize); vector<char> buffer(baseMsgSize);
socketRead(&buffer[0], baseMsgSize); socketRead(&buffer[0], baseMsgSize);
baseMessage.deserialize(&buffer[0]); baseMessage.deserialize(&buffer[0]);
cout << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << "\n"; //cout << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << "\n";
if (baseMessage.size > buffer.size()) if (baseMessage.size > buffer.size())
buffer.resize(baseMessage.size); buffer.resize(baseMessage.size);
socketRead(&buffer[0], baseMessage.size); socketRead(&buffer[0], baseMessage.size);