frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

make proto uses priorityRegister

Browse Source
This commit is contained in:
redpanther
2016-07-16 22:51:31 +02:00
parent 505b83f028
commit a8da7acd14
11 changed files with 69 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libsrc/protoserver/ProtoClientConnection.cpp
View File

@@ -20,16 +20,19 @@
// project includes
#include "ProtoClientConnection.h"
ProtoClientConnection::ProtoClientConnection(QTcpSocket *socket, Hyperion * hyperion) :
QObject(),
_socket(socket),
_imageProcessor(ImageProcessorFactory::getInstance().newImageProcessor()),
_hyperion(hyperion),
_receiveBuffer()
ProtoClientConnection::ProtoClientConnection(QTcpSocket *socket)
: QObject()
, _socket(socket)
, _imageProcessor(ImageProcessorFactory::getInstance().newImageProcessor())
, _hyperion(Hyperion::getInstance())
, _receiveBuffer()
, _priority(-1)
{
// connect internal signals and slots
connect(_socket, SIGNAL(disconnected()), this, SLOT(socketClosed()));
connect(_socket, SIGNAL(readyRead()), this, SLOT(readData()));
_priorityChannelName = "proto@"+ _socket->peerAddress().toString().toStdString();
}
ProtoClientConnection::~ProtoClientConnection()
@@ -76,6 +79,7 @@ void ProtoClientConnection::readData()
void ProtoClientConnection::socketClosed()
{
_hyperion->unRegisterPriority(_priorityChannelName);
emit connectionClosed(this);
}
@@ -110,6 +114,7 @@ void ProtoClientConnection::handleMessage(const proto::HyperionRequest & message
// forward messages
emit newMessage(&message);
int prevPriority = _priority;
switch (message.command())
{
case proto::HyperionRequest::COLOR:
@@ -142,12 +147,18 @@ void ProtoClientConnection::handleMessage(const proto::HyperionRequest & message
default:
handleNotImplemented();
}
if (prevPriority != _priority)
{
_hyperion->registerPriority(_priorityChannelName, _priority);
prevPriority = _priority;
}
}
void ProtoClientConnection::handleColorCommand(const proto::ColorRequest &message)
{
// extract parameters
int priority = message.priority();
_priority = message.priority();
int duration = message.has_duration() ? message.duration() : -1;
ColorRgb color;
color.red = qRed(message.rgbcolor());
@@ -155,7 +166,7 @@ void ProtoClientConnection::handleColorCommand(const proto::ColorRequest &messag
color.blue = qBlue(message.rgbcolor());
// set output
_hyperion->setColor(priority, color, duration);
_hyperion->setColor(_priority, color, duration);
// send reply
sendSuccessReply();
@@ -164,7 +175,7 @@ void ProtoClientConnection::handleColorCommand(const proto::ColorRequest &messag
void ProtoClientConnection::handleImageCommand(const proto::ImageRequest &message)
{
// extract parameters
int priority = message.priority();
_priority = message.priority();
int duration = message.has_duration() ? message.duration() : -1;
int width = message.imagewidth();
int height = message.imageheight();
@@ -186,7 +197,7 @@ void ProtoClientConnection::handleImageCommand(const proto::ImageRequest &messag
// process the image
std::vector<ColorRgb> ledColors = _imageProcessor->process(image);
_hyperion->setColors(priority, ledColors, duration);
_hyperion->setColors(_priority, ledColors, duration);
// send reply
sendSuccessReply();
@@ -196,11 +207,11 @@ void ProtoClientConnection::handleImageCommand(const proto::ImageRequest &messag
void ProtoClientConnection::handleClearCommand(const proto::ClearRequest &message)
{
// extract parameters
int priority = message.priority();
_priority = message.priority();
// clear priority
_hyperion->clear(priority);
_hyperion->clear(_priority);
_hyperion->unRegisterPriority(_priorityChannelName);
// send reply
sendSuccessReply();
}

6
libsrc/protoserver/ProtoClientConnection.h
View File

@@ -34,7 +34,7 @@ public:
/// @param socket The Socket object for this connection
/// @param hyperion The Hyperion server
///
ProtoClientConnection(QTcpSocket * socket, Hyperion * hyperion);
ProtoClientConnection(QTcpSocket * socket);
///
/// Destructor
@@ -137,4 +137,8 @@ private:
/// The buffer used for reading data from the socket
QByteArray _receiveBuffer;
int _priority;
std::string _priorityChannelName;
};

8
libsrc/protoserver/ProtoConnectionWrapper.cpp
View File

@@ -1,10 +1,10 @@
// protoserver includes
#include "protoserver/ProtoConnectionWrapper.h"
ProtoConnectionWrapper::ProtoConnectionWrapper(const std::string & address, int priority, int duration_ms, bool skipProtoReply) :
_priority(priority),
_duration_ms(duration_ms),
_connection(address)
ProtoConnectionWrapper::ProtoConnectionWrapper(const std::string & address, int priority, int duration_ms, bool skipProtoReply)
: _priority(priority)
, _duration_ms(duration_ms)
, _connection(address)
{
_connection.setSkipReply(skipProtoReply);
connect(&_connection, SIGNAL(setGrabbingMode(GrabbingMode)), this, SIGNAL(setGrabbingMode(GrabbingMode)));

14
libsrc/protoserver/ProtoServer.cpp
View File

@@ -7,12 +7,12 @@
#include "protoserver/ProtoConnection.h"
#include "ProtoClientConnection.h"
ProtoServer::ProtoServer(uint16_t port) :
QObject(),
_hyperion(Hyperion::getInstance()),
_server(),
_openConnections(),
_log(Logger::getInstance("PROTOSERVER"))
ProtoServer::ProtoServer(uint16_t port)
: QObject()
, _hyperion(Hyperion::getInstance())
, _server()
, _openConnections()
, _log(Logger::getInstance("PROTOSERVER"))
{
MessageForwarder * forwarder = _hyperion->getForwarder();
@@ -59,7 +59,7 @@ void ProtoServer::newConnection()
if (socket != nullptr)
{
Debug(_log, "New connection");
ProtoClientConnection * connection = new ProtoClientConnection(socket, _hyperion);
ProtoClientConnection * connection = new ProtoClientConnection(socket);
_openConnections.insert(connection);
// register slot for cleaning up after the connection closed