From 05ee316c1d8e66601174b4a88c5fac06c3cc325e Mon Sep 17 00:00:00 2001 From: redPanther Date: Fri, 20 Jan 2017 23:43:22 +0100 Subject: [PATCH] remove obsolete kodi code for grabbers (#372) --- include/grabber/DispmanxWrapper.h | 6 +----- include/hyperion/GrabberWrapper.h | 4 ---- libsrc/grabber/dispmanx/DispmanxWrapper.cpp | 12 ----------- libsrc/hyperion/GrabberWrapper.cpp | 22 ++------------------- 4 files changed, 3 insertions(+), 41 deletions(-) diff --git a/include/grabber/DispmanxWrapper.h b/include/grabber/DispmanxWrapper.h index 2dd7fa58..afe0bd1d 100644 --- a/include/grabber/DispmanxWrapper.h +++ b/include/grabber/DispmanxWrapper.h @@ -42,11 +42,7 @@ public slots: /// virtual void action(); - void setCropping(const unsigned cropLeft, const unsigned cropRight, - const unsigned cropTop, const unsigned cropBottom); - - virtual void kodiPlay(); - virtual void kodiPause(); + void setCropping(const unsigned cropLeft, const unsigned cropRight, const unsigned cropTop, const unsigned cropBottom); /// /// Set the video mode (2D/3D) diff --git a/include/hyperion/GrabberWrapper.h b/include/hyperion/GrabberWrapper.h index 8f21f687..4ed93cf8 100644 --- a/include/hyperion/GrabberWrapper.h +++ b/include/hyperion/GrabberWrapper.h @@ -48,10 +48,6 @@ signals: protected: - virtual void kodiPlay(); - virtual void kodiOff(); - virtual void kodiPause(); - void setColors(const std::vector &ledColors, const int timeout_ms); std::string _grabberName; diff --git a/libsrc/grabber/dispmanx/DispmanxWrapper.cpp b/libsrc/grabber/dispmanx/DispmanxWrapper.cpp index 3198d2a9..791195c3 100644 --- a/libsrc/grabber/dispmanx/DispmanxWrapper.cpp +++ b/libsrc/grabber/dispmanx/DispmanxWrapper.cpp @@ -43,18 +43,6 @@ void DispmanxWrapper::action() setColors(_ledColors, _timeout_ms); } -void DispmanxWrapper::kodiPlay() -{ - _grabber->setFlags(0); - GrabberWrapper::kodiPlay(); - -} - -void DispmanxWrapper::kodiPause() -{ - _grabber->setFlags(0); - GrabberWrapper::kodiPause(); -} void DispmanxWrapper::setVideoMode(const VideoMode mode) { diff --git a/libsrc/hyperion/GrabberWrapper.cpp b/libsrc/hyperion/GrabberWrapper.cpp index 83dc5e94..2ef9951d 100644 --- a/libsrc/hyperion/GrabberWrapper.cpp +++ b/libsrc/hyperion/GrabberWrapper.cpp @@ -80,39 +80,21 @@ void GrabberWrapper::componentStateChanged(const hyperion::Components component, } } -void GrabberWrapper::kodiPlay() -{ - start(); -} - -void GrabberWrapper::kodiPause() -{ - start(); -} - -void GrabberWrapper::kodiOff() -{ - stop(); -} - - void GrabberWrapper::setGrabbingMode(const GrabbingMode mode) { switch (mode) { case GRABBINGMODE_VIDEO: case GRABBINGMODE_PAUSE: - kodiPause(); - break; case GRABBINGMODE_AUDIO: case GRABBINGMODE_PHOTO: case GRABBINGMODE_MENU: case GRABBINGMODE_SCREENSAVER: case GRABBINGMODE_INVALID: - kodiPlay(); + start(); break; case GRABBINGMODE_OFF: - kodiOff(); + stop(); break; } }