From 153e75555d8254c96dc80e5e8a27e6a6546e959b Mon Sep 17 00:00:00 2001 From: johan Date: Thu, 14 Nov 2013 19:51:10 +0100 Subject: [PATCH] Changed default grabbing flags when no xbmc checker is present Former-commit-id: 9fabc0e570d44b301646c93b355042e1747a9183 --- deploy/hyperiond.REMOVED.git-id | 2 +- libsrc/dispmanx-grabber/DispmanxWrapper.cpp | 3 +-- src/hyperiond/hyperiond.cpp | 4 ---- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/deploy/hyperiond.REMOVED.git-id b/deploy/hyperiond.REMOVED.git-id index 1827fa2e..aaacfc20 100644 --- a/deploy/hyperiond.REMOVED.git-id +++ b/deploy/hyperiond.REMOVED.git-id @@ -1 +1 @@ -19c49770372d19eddcd87f647455964ca57d4f57 \ No newline at end of file +616598d4b62e2da40b2deeca332718c00209acfb \ No newline at end of file diff --git a/libsrc/dispmanx-grabber/DispmanxWrapper.cpp b/libsrc/dispmanx-grabber/DispmanxWrapper.cpp index 3893e94f..9fe1aee9 100644 --- a/libsrc/dispmanx-grabber/DispmanxWrapper.cpp +++ b/libsrc/dispmanx-grabber/DispmanxWrapper.cpp @@ -72,13 +72,12 @@ void DispmanxWrapper::setGrabbingMode(const GrabbingMode mode) case GRABBINGMODE_AUDIO: case GRABBINGMODE_PHOTO: case GRABBINGMODE_MENU: + case GRABBINGMODE_INVALID: _frameGrabber->setFlags(0); start(); break; case GRABBINGMODE_OFF: stop(); break; - case GRABBINGMODE_INVALID: - break; } } diff --git a/src/hyperiond/hyperiond.cpp b/src/hyperiond/hyperiond.cpp index e307ef6b..4f62ada8 100644 --- a/src/hyperiond/hyperiond.cpp +++ b/src/hyperiond/hyperiond.cpp @@ -133,10 +133,6 @@ int main(int argc, char** argv) { QObject::connect(xbmcVideoChecker, SIGNAL(grabbingMode(GrabbingMode)), dispmanx, SLOT(setGrabbingMode(GrabbingMode))); } - else - { - dispmanx->setGrabbingMode(GRABBINGMODE_VIDEO); - } dispmanx->start(); std::cout << "Frame grabber created and started" << std::endl;