mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
mDNS Support (#1452)
* Allow build, if no grabbers are enabled * Align available functions to right Qt version * Update to next development version * Align available functions to right Qt version * fix workflows (apt/nightly) * Disable QNetworkConfigurationManager deprecation warnings * Initial go on Smart Pointers * Add Deallocation * Correct QT_WARNING_DISABLE_DEPRECATED (available since 5.9) * Cluster Build Variables * Hyperion Light * Address build warnings * Hyperion Light - UI * Update Protobuf to latest master * Removed compiler warnings * Added restart ability to systray * Correct Protobuf * Ignore 'no-return' warning on protobuf build * hyperion-remote: Fix auto discovery of hyperion server * Fix Qt version override * Update changelog * Remove Grabber Components, if no Grabber exists * Standalone Grabber - Fix fps default * Remote Control - Have Source Selction accrosswhole screen * Enable Blackborder detection only, if relevant input sources available * Enable Blackborder detection only, if relevant input sources available * Remote UI - rearrange containers * Checkout * Fix compilation on windows * Re-added qmdnsengine template cmake * chrono added for linux * Removed existing AVAHI/Bonjour, allow to enable/disable mDNS * hyperiond macos typo fix * Fix macOS Bundle build * Fix macOS bundle info details * Correct CMake files * Removed existing AVAHI/Bonjour (2) * Share hyperion's services via mDNS * Add mDNS Browser and mDNS for LED-Devices * Support mDNS discovery for standalone grabbers * Remove ZLib Dependency & Cleanup * mDNS - hanle 2.local2 an ".local." domains equally * Hue - Link discovery to bridge class, workaround port 443 for mDNS discovery * Fix save button state when switching between devices * Removed sessions (of other hyperions) * mDNS Publisher - Simplify service naming * mDNS refactoring & Forwarder discovery * mDNS Updates to use device service name * Consistency of standalone grabbers with mDNS Service Registry * Merge branch 'hyperion-project:master' into mDNS * Start JSON and WebServers only after Instance 0 is available * Remove bespoke qDebug Output again * MDNS updates and refactor Forwarder * Minor updates * Upgrade to CMake 3.1 * typo * macOS fix * Correct merge * - Remove dynamic linker flag from standalone dispmanX Grabber - Added ability to use system qmdns libs * Cec handler library will load at runtime * typo fix * protobuf changes * mDNS changes for Windows/macOS * test window build qmdnsengine * absolute path to protobuf cmake dir * Rework Hue Wizard supporting mDNS * LED-Devices - Retry support + Refactoring (excl. Hue) * LED-Devices - Refactoring/Retry support Hue + additional alignments * Address LGTM findings * Fix CI-Build, revert test changes * Build Windows in Release mode to avoid python problem * Correct that WebServerObject is available earlier * Ensure that instance name in logs for one instance are presented * Update content LEDs * Rework mDNS Address lookup * Fix LED UI * Fix for non mDNS Services (ignore default port) * Disbale device when now input is available * Revert back some updates, ensure last color is updated when switched on * Handle reopening case and changed IP, port for API-calls * Add UPD-DDP Device * WLED support for DDP * Fix printout * LEDDevice - Allow more retries, udapte defaults * LED-Net Devices - Select Custom device, if configured Co-authored-by: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com> Co-authored-by: Paulchen Panther <Paulchen-Panter@protonmail.com>
This commit is contained in:
@@ -28,6 +28,17 @@
|
||||
class Hyperion;
|
||||
class QTcpSocket;
|
||||
class FlatBufferConnection;
|
||||
class MessageForwarderFlatbufferClientsHelper;
|
||||
|
||||
struct TargetHost {
|
||||
QHostAddress host;
|
||||
quint16 port;
|
||||
|
||||
bool operator == (TargetHost const& a) const
|
||||
{
|
||||
return ((host == a.host) && (port == a.port));
|
||||
}
|
||||
};
|
||||
|
||||
class MessageForwarder : public QObject
|
||||
{
|
||||
@@ -39,14 +50,15 @@ public:
|
||||
void addJsonTarget(const QJsonObject& targetConfig);
|
||||
void addFlatbufferTarget(const QJsonObject& targetConfig);
|
||||
|
||||
private slots:
|
||||
public slots:
|
||||
///
|
||||
/// @brief Handle settings update from Hyperion Settingsmanager emit or this constructor
|
||||
/// @param type settingyType from enum
|
||||
/// @param type settingsType from enum
|
||||
/// @param config configuration object
|
||||
///
|
||||
void handleSettingsUpdate(settings::type type, const QJsonDocument &config);
|
||||
|
||||
private slots:
|
||||
///
|
||||
/// @brief Handle component state change MessageForwarder
|
||||
/// @param component The component from enum
|
||||
@@ -81,15 +93,13 @@ private slots:
|
||||
|
||||
private:
|
||||
|
||||
struct TargetHost {
|
||||
QHostAddress host;
|
||||
quint16 port;
|
||||
void enableTargets(bool enable, const QJsonObject& config);
|
||||
|
||||
bool operator == (TargetHost const& a) const
|
||||
{
|
||||
return ((host == a.host) && (port == a.port));
|
||||
}
|
||||
};
|
||||
int startJsonTargets(const QJsonObject& config);
|
||||
void stopJsonTargets();
|
||||
|
||||
int startFlatbufferTargets(const QJsonObject& config);
|
||||
void stopFlatbufferTargets();
|
||||
|
||||
/// Hyperion instance
|
||||
Hyperion *_hyperion;
|
||||
@@ -105,10 +115,37 @@ private:
|
||||
|
||||
/// Flatbuffer connection for forwarding
|
||||
QList<TargetHost> _flatbufferTargets;
|
||||
QList<FlatBufferConnection*> _forwardClients;
|
||||
|
||||
/// Flag if forwarder is enabled
|
||||
bool _forwarder_enabled = true;
|
||||
|
||||
const int _priority;
|
||||
|
||||
MessageForwarderFlatbufferClientsHelper* _messageForwarderFlatBufHelper;
|
||||
};
|
||||
|
||||
class MessageForwarderFlatbufferClientsHelper : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
||||
public:
|
||||
MessageForwarderFlatbufferClientsHelper();
|
||||
~MessageForwarderFlatbufferClientsHelper();
|
||||
|
||||
signals:
|
||||
void addClient(const QString& origin, const TargetHost& targetHost, int priority, bool skipReply);
|
||||
void clearClients();
|
||||
|
||||
public slots:
|
||||
bool isFree() const;
|
||||
|
||||
void forwardImage(const Image<ColorRgb>& image);
|
||||
void addClientHandler(const QString& origin, const TargetHost& targetHost, int priority, bool skipReply);
|
||||
void clearClientsHandler();
|
||||
|
||||
private:
|
||||
|
||||
QList<FlatBufferConnection*> _forwardClients;
|
||||
bool _free;
|
||||
};
|
||||
|
Reference in New Issue
Block a user