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

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