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

controller

Browse source 
git-svn-id: svn://elaine/murooma/trunk@242 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-09-09 20:31:03 +00:00
parent e342a4108e
commit 00fac3eccb
15 changed files with 126 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

61
client/controller.cpp
View file

@ -1,41 +1,63 @@
#include "controller.h"
#include <iostream>
#include <string>
#include <unistd.h>
#include "oggDecoder.h"
#include "pcmDecoder.h"
#include "player.h"
using namespace std;
Controller::Controller() : MessageReceiver(), active_(false)
Controller::Controller() : MessageReceiver(), active_(false), sampleFormat(NULL)
{
decoder = new OggDecoder();
}
void Controller::onMessageReceived(BaseMessage* message)
void Controller::onMessageReceived(tcp::socket* socket, const BaseMessage& baseMessage, char* buffer)
{
if (message->type == message_type::payload)
if (baseMessage.type == message_type::payload)
{
/* if (decoder.decode((PcmChunk*)message))
stream_->addChunk((PcmChunk*)message);
else
*/ delete message;
//cout << ", decoded: " << chunk->payloadSize << ", Duration: " << chunk->getDuration() << ", sec: " << chunk->tv_sec << ", usec: " << chunk->tv_usec/1000 << ", type: " << chunk->type << "\n";
if ((stream != NULL) && (decoder != NULL))
{
PcmChunk* pcmChunk = new PcmChunk(*sampleFormat, 0);
pcmChunk->deserialize(baseMessage, buffer);
//cout << "chunk: " << pcmChunk->payloadSize;
if (decoder->decode(pcmChunk))
{
stream->addChunk(pcmChunk);
//cout << ", decoded: " << pcmChunk->payloadSize << ", Duration: " << pcmChunk->getDuration() << ", sec: " << pcmChunk->tv_sec << ", usec: " << pcmChunk->tv_usec/1000 << ", type: " << pcmChunk->type << "\n";
}
else
delete pcmChunk;
}
}
else if (message->type == message_type::header)
else if (baseMessage.type == message_type::header)
{
// decoder.setHeader((HeaderMessage*)message);
if (decoder != NULL)
{
HeaderMessage* headerMessage = new HeaderMessage();
headerMessage->deserialize(baseMessage, buffer);
decoder->setHeader(headerMessage);
}
}
else if (message->type == message_type::sampleformat)
else if (baseMessage.type == message_type::sampleformat)
{
SampleFormat* sampleFormat = (SampleFormat*)message;
sampleFormat = new SampleFormat();
sampleFormat->deserialize(baseMessage, buffer);
cout << "SampleFormat rate: " << sampleFormat->rate << ", bits: " << sampleFormat->bits << ", channels: " << sampleFormat->channels << "\n";
delete sampleFormat;
}
}
void Controller::start()
void Controller::start(std::string& _ip, size_t _port, int _bufferMs)
{
bufferMs = _bufferMs;
connection = new ServerConnection();
connection->start(this, _ip, _port);
controllerThread = new thread(&Controller::worker, this);
}
@ -49,7 +71,17 @@ void Controller::stop()
void Controller::worker()
{
// Decoder* decoder;
active_ = true;
while (sampleFormat == NULL)
usleep(10000);
stream = new Stream(SampleFormat(*sampleFormat));
stream->setBufferLen(bufferMs);
Player player(stream);
player.start();
while (active_)
{
usleep(10000);
@ -57,3 +89,4 @@ void Controller::worker()
}