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

Random cleanup (#861)

Browse Source 
Co-authored-by: Seker <murat.seker@barco.com>
This commit is contained in:
Murat Seker
2020-07-12 09:19:59 +02:00
committed by GitHub
parent de9ece5139
commit 138b7d9c94
74 changed files with 115 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/hyperion/Hyperion.h
View File

@@ -2,7 +2,6 @@
// stl includes
#include <list>
#include <QMap>
// QT includes
#include <QString>
@@ -11,6 +10,7 @@
#include <QJsonObject>
#include <QJsonValue>
#include <QJsonArray>
#include <QMap>
#include <QMutex>
// hyperion-utils includes
@@ -59,32 +59,25 @@ class Hyperion : public QObject
Q_OBJECT
public:
/// Type definition of the info structure used by the priority muxer
typedef PriorityMuxer::InputInfo InputInfo;
///
/// RGB-Color channel enumeration
///
enum RgbChannel
{
BLACK, WHITE, RED, GREEN, BLUE, CYAN, MAGENTA, YELLOW, INVALID
};
using InputInfo = PriorityMuxer::InputInfo;
///
/// Destructor; cleans up resources
///
virtual ~Hyperion();
~Hyperion() override;
///
/// free all alocated objects, should be called only from constructor or before restarting hyperion
///
void freeObjects(bool emitCloseSignal=false);
ImageProcessor* getImageProcessor() { return _imageProcessor; };
ImageProcessor* getImageProcessor() { return _imageProcessor; }
///
/// @brief Get instance index of this instance
/// @return The index of this instance
///
const quint8 & getInstanceIndex() { return _instIndex; };
const quint8 & getInstanceIndex() { return _instIndex; }
///
/// Returns the number of attached leds
@@ -94,7 +87,7 @@ public:
///
/// @brief Return the size of led grid
///
QSize getLedGridSize() const { return _ledGridSize; };
QSize getLedGridSize() const { return _ledGridSize; }
/// gets the methode how image is maped to leds
const int & getLedMappingType();
@@ -110,8 +103,8 @@ public:
///
/// @brief Get the current active led device
/// @return The device nam
/// e
/// @return The device name
///
const QString & getActiveDeviceType();
///
@@ -206,7 +199,7 @@ public slots:
/// @return EffectEngine instance pointer
///
EffectEngine* getEffectEngineInstance() { return _effectEngine; };
EffectEngine* getEffectEngineInstance() { return _effectEngine; }
///
/// @brief Save an effect
/// @param obj The effect args
@@ -259,7 +252,7 @@ public slots:
/// @brief Get a pointer to the priorityMuxer instance
/// @return PriorityMuxer instance pointer
///
PriorityMuxer* getMuxerInstance() { return &_muxer; };
PriorityMuxer* getMuxerInstance() { return &_muxer; }
///
/// @brief enable/disable automatic/priorized source selection
@@ -335,7 +328,7 @@ public slots:
/// @brief Get the component Register
/// return Component register pointer
///
ComponentRegister& getComponentRegister() { return _componentRegister; };
ComponentRegister& getComponentRegister() { return _componentRegister; }
///
/// @brief Called from components to update their current state. DO NOT CALL FROM USERS
@@ -489,7 +482,7 @@ private slots:
///
/// @brief Apply new videoMode from Daemon to _currVideoMode
///
void handleNewVideoMode(const VideoMode& mode) { _currVideoMode = mode; };
void handleNewVideoMode(const VideoMode& mode) { _currVideoMode = mode; }
private:
friend class HyperionDaemon;