avhai cleanup + grabber list (#402)

* - cleanup shared_avahi stuff
- add a list of avilable grabbers to json server info

* fix compile
This commit is contained in:
redPanther
2017-02-17 08:33:34 +01:00
committed by GitHub
parent 195226ec69
commit 26154befa4
6 changed files with 81 additions and 38 deletions

View File

@@ -3,6 +3,8 @@
#include <QObject>
#include <QTimer>
#include <string>
#include <QString>
#include <QStringList>
#include <utils/Logger.h>
#include <utils/Components.h>
@@ -15,7 +17,7 @@ class GrabberWrapper : public QObject
{
Q_OBJECT
public:
GrabberWrapper(std::string grabberName, const int priority, hyperion::Components grabberComponentId=hyperion::COMP_GRABBER);
GrabberWrapper(QString grabberName, const int priority, hyperion::Components grabberComponentId=hyperion::COMP_GRABBER);
virtual ~GrabberWrapper();
@@ -29,6 +31,8 @@ public:
///
virtual void stop();
static QStringList availableGrabbers();
public slots:
void componentStateChanged(const hyperion::Components component, bool enable);
@@ -49,7 +53,7 @@ signals:
protected:
void setColors(const std::vector<ColorRgb> &ledColors, const int timeout_ms);
std::string _grabberName;
QString _grabberName;
/// Pointer to Hyperion for writing led values
Hyperion * _hyperion;