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

The WebUI remote page has been rearranged

Browse Source 
Set interuption flag to running effects when hyperion emits finished signal
Protobuffer, Flatbuffer and Boblight connection priority check to avoid unwanted program behavior

Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com>
This commit is contained in:
Paulchen-Panther
2019-08-02 21:12:13 +02:00
parent 2e8014bdbb
commit cacfbada7a
8 changed files with 66 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libsrc/protoserver/ProtoClientConnection.cpp
View File

@@ -7,12 +7,6 @@
#include <QTimer>
#include <QRgb>
// Hyperion includes
#include <hyperion/Hyperion.h>
// Hyperion instance manager includes
#include <hyperion/HyperionIManager.h>
// TODO Remove this class if third-party apps have been migrated (eg. Hyperion Android Gabber, Windows Screen grabber etc.)
ProtoClientConnection::ProtoClientConnection(QTcpSocket* socket, const int &timeout, QObject *parent)
@@ -130,6 +124,12 @@ void ProtoClientConnection::handleColorCommand(const proto::ColorRequest &messag
color.green = qGreen(message.rgbcolor());
color.blue = qBlue(message.rgbcolor());
if (priority < 100 || priority >= 200)
{
sendErrorReply("The priority " + std::to_string(priority) + " is not in the priority range between 100 and 199.");
return;
}
// make sure the prio is registered before setColor()
if(priority != _priority)
{
@@ -154,6 +154,12 @@ void ProtoClientConnection::handleImageCommand(const proto::ImageRequest &messag
int height = message.imageheight();
const std::string & imageData = message.imagedata();
if (priority < 100 || priority >= 200)
{
sendErrorReply("The priority " + std::to_string(priority) + " is not in the priority range between 100 and 199.");
return;
}
// make sure the prio is registered before setInput()
if(priority != _priority)
{

3
libsrc/protoserver/ProtoClientConnection.h
View File

@@ -11,10 +11,9 @@
class QTcpSocket;
class QTimer;
class Hyperion;
namespace proto {
class HyperionRequest;
class HyperionRequest;
}
///