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

implement webui live video (#340)

Browse Source 
* implement webui live video

* add missing german translation
This commit is contained in:
redPanther
2016-12-18 19:00:14 +01:00
committed by GitHub
parent 23194730c2
commit 721668fc85
15 changed files with 156 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libsrc/jsonserver/JsonClientConnection.h
View File

@@ -6,6 +6,7 @@
// Qt includes
#include <QByteArray>
#include <QTcpSocket>
#include <QMutex>
// Hyperion includes
#include <hyperion/Hyperion.h>
@@ -116,6 +117,7 @@ public slots:
void componentStateChanged(const hyperion::Components component, bool enable);
void streamLedcolorsUpdate();
void incommingLogMessage(Logger::T_LOG_MESSAGE);
void setImage(int priority, const Image<ColorRgb> & image, int duration_ms);
signals:
///
@@ -338,12 +340,21 @@ private:
/// timer for ledcolors streaming
QTimer _timer_ledcolors;
// streaming buffers
QJsonObject _streaming_leds_reply;
QJsonObject _streaming_image_reply;
QJsonObject _streaming_logging_reply;
/// flag to determine state of log streaming
bool _streaming_logging_activated;
/// mutex to determine state of image streaming
QMutex _image_stream_mutex;
/// timeout for live video refresh
volatile qint64 _image_stream_timeout;
// masks for fields in the basic header
static uint8_t const BHB0_OPCODE = 0x0F;
static uint8_t const BHB0_RSV3 = 0x10;