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

server Settings

Browse source 
git-svn-id: svn://elaine/murooma/trunk@255 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-09-12 15:04:17 +00:00
parent f7cf7a2537
commit 979f6460d3
11 changed files with 122 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

27
client/controller.cpp
View file

@ -5,12 +5,12 @@
#include "oggDecoder.h"
#include "pcmDecoder.h"
#include "player.h"
#include "common/serverSettings.h"
using namespace std;
Controller::Controller() : MessageReceiver(), active_(false), sampleFormat(NULL)
Controller::Controller() : MessageReceiver(), active_(false), streamClient(NULL), sampleFormat(NULL)
{
decoder = new OggDecoder();
}
@ -18,6 +18,7 @@ Controller::Controller() : MessageReceiver(), active_(false), sampleFormat(NULL)
void Controller::onMessageReceived(SocketConnection* connection, const BaseMessage& baseMessage, char* buffer)
{
//cout << "onMessageReceived: " << baseMessage.type << ", size: " << baseMessage.size << "\n";
if (baseMessage.type == message_type::payload)
{
if ((stream != NULL) && (decoder != NULL))
@ -49,18 +50,23 @@ void Controller::onMessageReceived(SocketConnection* connection, const BaseMessa
sampleFormat->deserialize(baseMessage, buffer);
cout << "SampleFormat rate: " << sampleFormat->rate << ", bits: " << sampleFormat->bits << ", channels: " << sampleFormat->channels << "\n";
}
else if (baseMessage.type == message_type::serversettings)
{
ServerSettings* serverSettings = new ServerSettings();
serverSettings->deserialize(baseMessage, buffer);
cout << "ServerSettings port: " << serverSettings->port << "\n";
streamClient = new StreamClient(this, ip, serverSettings->port);
}
}
void Controller::start(std::string& _ip, size_t _port, int _bufferMs)
void Controller::start(const std::string& _ip, size_t _port, int _bufferMs)
{
bufferMs = _bufferMs;
ip = _ip;
connection = new ClientConnection(this, _ip, _port);
connection->start();
// controlConnection = new ClientConnection(this, _ip, _port + 1);
// controlConnection->start();
controlConnection = new ClientConnection(this, ip, _port);
controlConnection->start();
controllerThread = new thread(&Controller::worker, this);
}
@ -77,10 +83,13 @@ void Controller::worker()
// Decoder* decoder;
active_ = true;
while (sampleFormat == NULL)
while ((sampleFormat == NULL) && (streamClient == NULL))
{
usleep(10000);
}
streamClient->start();
stream = new Stream(SampleFormat(*sampleFormat));
stream->setBufferLen(bufferMs);