i18n corrected

libqt5sql5-sqlite appended to the dependency list
lgtm alerts fixed
added message forwarder to global settings
subscribe type leds-update appended (thanks @Brindosch)
Boblight server port check instead of error message
Race Condition of different priorities are prevented at startup

Signed-off-by: Paulchen-Panther <Paulchen-Panter@protonmail.com>
This commit is contained in:
Paulchen-Panther
2019-07-20 11:28:16 +02:00
parent 3a488e703c
commit af416ba5fc
18 changed files with 72 additions and 829 deletions

View File

@@ -146,7 +146,7 @@ private:
/// @param forced indicate if it was a forced switch by system
/// @return true on success. false if not found
///
const bool handleInstanceSwitch(const quint8& instance = 0, const bool& forced = false);
bool handleInstanceSwitch(const quint8& instance = 0, const bool& forced = false);
///
/// Handle an incoming JSON Color message
@@ -287,7 +287,7 @@ private:
/// @param token The token to verify
/// @return True on succcess else false (pushes failed client feedback)
///
const bool handleHTTPAuth(const QString& command, const int& tan, const QString& token);
bool handleHTTPAuth(const QString& command, const int& tan, const QString& token);
/// Handle an incoming JSON instance message
///

View File

@@ -94,6 +94,13 @@ private slots:
///
void handleSettingsChange(const settings::type& type, const QJsonDocument& data);
///
/// @brief Handle led config specific updates (required for led color streaming with positional display)
/// @param type The settings type from enum
/// @param data The data as QJsonDocument
///
void handleLedsConfigChange(const settings::type& type, const QJsonDocument& data);
///
/// @brief Handle Hyperion instance manager change
///

View File

@@ -37,7 +37,7 @@ public:
/// @param[out] inst The id that has been assigned
/// @return True on success else false
///
inline const bool createInstance(const QString& name, quint8& inst)
inline bool createInstance(const QString& name, quint8& inst)
{
VectorPair fcond;
fcond.append(CPair("friendly_name",name));
@@ -71,7 +71,7 @@ public:
/// @param inst The id that has been assigned
/// @return True on success else false
///
inline const bool deleteInstance(const quint8& inst)
inline bool deleteInstance(const quint8& inst)
{
VectorPair cond;
cond.append(CPair("instance",inst));
@@ -91,7 +91,7 @@ public:
/// @param name The new name of the instance
/// @return True on success else false (instance not found)
///
inline const bool saveName(const quint8& inst, const QString& name)
inline bool saveName(const quint8& inst, const QString& name)
{
if(instanceExist(inst))
{
@@ -136,7 +136,7 @@ public:
/// @param[in] user The user id
/// @return true on success else false
///
inline const bool instanceExist(const quint8& inst)
inline bool instanceExist(const quint8& inst)
{
VectorPair cond;
cond.append(CPair("instance",inst));
@@ -191,7 +191,7 @@ public:
/// @param inst The instance to get
/// @return True when enabled else false
///
inline const bool isEnabled(const quint8& inst)
inline bool isEnabled(const quint8& inst)
{
VectorPair cond;
cond.append(CPair("instance", inst));

View File

@@ -110,7 +110,7 @@ public:
// list of global settings
QStringList list;
// server port services
list << "jsonServer" << "protoServer" << "flatbufServer" << "udpListener" << "webConfig" << "network"
list << "jsonServer" << "protoServer" << "flatbufServer" << "udpListener" << "forwarder" << "webConfig" << "network"
// capture
<< "framegrabber" << "grabberV4L2"
// other

View File

@@ -510,8 +510,8 @@ private:
/// Effect engine
EffectEngine * _effectEngine;
// // Message forwarder
// MessageForwarder * _messageForwarder;
// Message forwarder
MessageForwarder * _messageForwarder;
/// Logger instance
Logger * _log;

View File

@@ -57,7 +57,7 @@ public:
/// @param block If true return when thread has been started
/// @return Return true on success, false if not found in db
///
const bool startInstance(const quint8& inst, const bool& block = false);
bool startInstance(const quint8& inst, const bool& block = false);
///
/// @brief Stop a Hyperion instance
@@ -65,7 +65,7 @@ public:
/// @param block If true return when thread has been started
/// @return Return true on success, false if not found in db
///
const bool stopInstance(const quint8& inst, const bool& block = false);
bool stopInstance(const quint8& inst, const bool& block = false);
///
/// @brief Create a new Hyperion instance entry in db
@@ -73,14 +73,14 @@ public:
/// @param start If true it will be started after creation (async)
/// @return Return true on success false if name is already in use or a db error occurred
///
const bool createInstance(const QString& name, const bool& start = false);
bool createInstance(const QString& name, const bool& start = false);
///
/// @brief Delete Hyperion instance entry in db. Cleanup also all associated table data for this instance
/// @param inst The instance index
/// @return Return true on success, false if not found or not allowed
///
const bool deleteInstance(const quint8& inst);
bool deleteInstance(const quint8& inst);
///
/// @brief Assign a new name to the given instance
@@ -88,7 +88,7 @@ public:
/// @param name The instance name index
/// @return Return true on success, false if not found
///
const bool saveName(const quint8& inst, const QString& name);
bool saveName(const quint8& inst, const QString& name);
signals:
///
@@ -166,7 +166,7 @@ private:
/// @brief check if a instance is allowed for management. Instance 0 represents the root instance
/// @apram inst The instance to check
///
const bool isInstAllowed(const quint8& inst) { return (inst > 0); };
bool isInstAllowed(const quint8& inst) { return (inst > 0); };
private:
Logger* _log;

View File

@@ -29,7 +29,7 @@ public:
quint16 getPort() { return _port; };
/// check if server has been inited
const bool isInited() { return _inited; };
bool isInited() { return _inited; };
///
/// @brief Set a new description, if empty the description is NotFound for clients