frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/hyperion.config.json.commented
View File

@ -188,7 +188,7 @@
"greenSignalThreshold" : 0.0, "greenSignalThreshold" : 0.0,
"blueSignalThreshold" : 0.0 "blueSignalThreshold" : 0.0
} }
] ],
/// The configuration for the frame-grabber, contains the following items: /// The configuration for the frame-grabber, contains the following items:
/// * enable : true if the framegrabber (platform grabber) should be activated /// * enable : true if the framegrabber (platform grabber) should be activated

2
config/hyperion.config.json.default
View File

@ -117,7 +117,7 @@
"greenSignalThreshold" : 0.0, "greenSignalThreshold" : 0.0,
"blueSignalThreshold" : 0.0 "blueSignalThreshold" : 0.0
} }
] ],
"framegrabber" : "framegrabber" :
{ {

3
include/hyperion/GrabberWrapper.h
View File

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

5
include/utils/Components.h
View File

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

2
libsrc/grabber/v4l2/V4L2Wrapper.cpp
View File

@ -16,7 +16,7 @@ V4L2Wrapper::V4L2Wrapper(const std::string &device,
double greenSignalThreshold, double greenSignalThreshold,
double blueSignalThreshold, double blueSignalThreshold,
const int priority) const int priority)
: GrabberWrapper("V4L2:"+device, priority) : GrabberWrapper("V4L2:"+device, priority, hyperion::COMP_V4L)
, _timeout_ms(1000) , _timeout_ms(1000)
, _grabber(device, , _grabber(device,
input, input,

5
libsrc/hyperion/GrabberWrapper.cpp
View File

@ -4,7 +4,7 @@
#include <hyperion/GrabberWrapper.h> #include <hyperion/GrabberWrapper.h>
GrabberWrapper::GrabberWrapper(std::string grabberName, const int priority) GrabberWrapper::GrabberWrapper(std::string grabberName, const int priority, hyperion::Components grabberComponentId)
: _grabberName(grabberName) : _grabberName(grabberName)
, _hyperion(Hyperion::getInstance()) , _hyperion(Hyperion::getInstance())
, _priority(priority) , _priority(priority)
@ -12,6 +12,7 @@ GrabberWrapper::GrabberWrapper(std::string grabberName, const int priority)
, _log(Logger::getInstance(grabberName.c_str())) , _log(Logger::getInstance(grabberName.c_str()))
, _forward(true) , _forward(true)
, _processor(ImageProcessorFactory::getInstance().newImageProcessor()) , _processor(ImageProcessorFactory::getInstance().newImageProcessor())
, _grabberComponentId(grabberComponentId)
{ {
_timer.setSingleShot(false); _timer.setSingleShot(false);
@ -44,7 +45,7 @@ void GrabberWrapper::stop()
void GrabberWrapper::componentStateChanged(const hyperion::Components component, bool enable) void GrabberWrapper::componentStateChanged(const hyperion::Components component, bool enable)
{ {
if (component == hyperion::COMP_GRABBER && _timer.isActive() != enable) if (component == _grabberComponentId && _timer.isActive() != enable)
{ {
if (enable) start(); if (enable) start();
else stop(); else stop();

2
libsrc/jsonserver/schema/schema-componentstate.json
View File

@ -21,7 +21,7 @@
"component": "component":
{ {
"type" : "string", "type" : "string",
"enum" : ["SMOOTHING", "BLACKBORDER", "KODICHECKER", "FORWARDER", "UDPLISTENER", "BOBLIGHTSERVER", "GRABBER"], "enum" : ["SMOOTHING", "BLACKBORDER", "KODICHECKER", "FORWARDER", "UDPLISTENER", "BOBLIGHTSERVER", "GRABBER", "V4L"],
"required": true "required": true
}, },
"state": "state":

4
src/hyperion-remote/hyperion-remote.cpp
View File

@ -65,8 +65,8 @@ int main(int argc, char * argv[])
BooleanOption & argServerInfo = parser.add<BooleanOption> ('l', "list" , "List server info and active effects with priority and duration"); BooleanOption & argServerInfo = parser.add<BooleanOption> ('l', "list" , "List server info and active effects with priority and duration");
BooleanOption & argClear = parser.add<BooleanOption> ('x', "clear" , "Clear data for the priority channel provided by the -p option"); BooleanOption & argClear = parser.add<BooleanOption> ('x', "clear" , "Clear data for the priority channel provided by the -p option");
BooleanOption & argClearAll = parser.add<BooleanOption> (0x0, "clearall" , "Clear data for all active priority channels"); BooleanOption & argClearAll = parser.add<BooleanOption> (0x0, "clearall" , "Clear data for all active priority channels");
Option & argEnableComponent = parser.add<Option> ('E', "enable" , "Enable the Component with the given name. Available Components are [SMOOTHING, BLACKBORDER, KODICHECKER, FORWARDER, UDPLISTENER, BOBLIGHT_SERVER, GRABBER]"); Option & argEnableComponent = parser.add<Option> ('E', "enable" , "Enable the Component with the given name. Available Components are [SMOOTHING, BLACKBORDER, KODICHECKER, FORWARDER, UDPLISTENER, BOBLIGHT_SERVER, GRABBER, V4L]");
Option & argDisableComponent = parser.add<Option> ('D', "disable" , "Disable the Component with the given name. Available Components are [SMOOTHING, BLACKBORDER, KODICHECKER, FORWARDER, UDPLISTENER, BOBLIGHT_SERVER, GRABBER]"); Option & argDisableComponent = parser.add<Option> ('D', "disable" , "Disable the Component with the given name. Available Components are [SMOOTHING, BLACKBORDER, KODICHECKER, FORWARDER, UDPLISTENER, BOBLIGHT_SERVER, GRABBER, V4L]");
Option & argId = parser.add<Option> ('q', "qualifier" , "Identifier(qualifier) of the transform to set"); Option & argId = parser.add<Option> ('q', "qualifier" , "Identifier(qualifier) of the transform to set");
DoubleOption & argSaturation = parser.add<DoubleOption> ('s', "saturation", "!DEPRECATED! Will be removed soon! Set the HSV saturation gain of the leds"); DoubleOption & argSaturation = parser.add<DoubleOption> ('s', "saturation", "!DEPRECATED! Will be removed soon! Set the HSV saturation gain of the leds");
DoubleOption & argValue = parser.add<DoubleOption> ('v', "getColors" , "!DEPRECATED! Will be removed soon! Set the HSV getColors gain of the leds"); DoubleOption & argValue = parser.add<DoubleOption> ('v', "getColors" , "!DEPRECATED! Will be removed soon! Set the HSV getColors gain of the leds");