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

fix typo in config

Browse Source 
spilt grabber components in "GRABBER" and "V4L"
This commit is contained in:
redpanther
2016-08-31 00:54:47 +02:00
parent a85a5c0f2c
commit 9a2b167db7
8 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/hyperion/GrabberWrapper.h
View File

@@ -15,7 +15,7 @@ class GrabberWrapper : public QObject
{
Q_OBJECT
public:
GrabberWrapper(std::string grabberName, const int priority);
GrabberWrapper(std::string grabberName, const int priority, hyperion::Components grabberComponentId=hyperion::COMP_GRABBER);
virtual ~GrabberWrapper();
@@ -72,4 +72,5 @@ protected:
/// The processor for transforming images to led colors
ImageProcessor * _processor;
hyperion::Components _grabberComponentId;
};

5
include/utils/Components.h
View File

@@ -15,7 +15,8 @@ enum Components
COMP_FORWARDER,
COMP_UDPLISTENER,
COMP_BOBLIGHTSERVER,
COMP_GRABBER
COMP_GRABBER,
COMP_V4L
};
inline const char* componentToString(Components c)
@@ -29,6 +30,7 @@ inline const char* componentToString(Components c)
case COMP_UDPLISTENER: return "UDP listener";
case COMP_BOBLIGHTSERVER:return "Boblight server";
case COMP_GRABBER: return "Framegrabber";
case COMP_V4L: return "V4l Capture device";
default: return "";
}
}
@@ -43,6 +45,7 @@ inline Components stringToComponent(QString component)
if (component == "UDPLISTENER") return COMP_UDPLISTENER;
if (component == "BOBLIGHTSERVER")return COMP_BOBLIGHTSERVER;
if (component == "GRABBER") return COMP_GRABBER;
if (component == "V4L") return COMP_V4L;
return COMP_INVALID;
}