Merge remote-tracking branch 'refs/remotes/tvdzwan/master' into test

Former-commit-id: 19831aa23078659d7f285b0e91bffff21a932283
This commit is contained in:
AEtHeLsYn
2016-03-13 11:52:38 +01:00
68 changed files with 1255 additions and 552 deletions

View File

@@ -12,10 +12,10 @@
#include <grabber/DispmanxFrameGrabber.h>
DispmanxWrapper::DispmanxWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion) :
DispmanxWrapper::DispmanxWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, const int priority, Hyperion * hyperion) :
_updateInterval_ms(1000/updateRate_Hz),
_timeout_ms(2 * _updateInterval_ms),
_priority(1000),
_priority(priority),
_timer(),
_image(grabWidth, grabHeight),
_frameGrabber(new DispmanxFrameGrabber(grabWidth, grabHeight)),