frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

rework kodi grabbing mode for all grabbers (#169)

Browse Source 
* pull out setgrabbing mode from every grabber into parent class

* implement optional kodi check for v4l

* fix typo

* fix dispmanx build
This commit is contained in:
redPanther
2016-08-12 23:07:32 +02:00
committed by GitHub
parent 050ab11c8e
commit 7ee2e7cf8d
15 changed files with 99 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libsrc/grabber/amlogic/AmlogicWrapper.cpp
View File

@@ -50,29 +50,6 @@ void AmlogicWrapper::action()
_hyperion->setColors(_priority, _ledColors, _timeout_ms);
}
void AmlogicWrapper::setGrabbingMode(const GrabbingMode mode)
{
switch (mode)
{
case GRABBINGMODE_VIDEO:
case GRABBINGMODE_PAUSE:
// _grabber->setFlags(DISPMANX_SNAPSHOT_NO_RGB|DISPMANX_SNAPSHOT_FILL);
start();
break;
case GRABBINGMODE_AUDIO:
case GRABBINGMODE_PHOTO:
case GRABBINGMODE_MENU:
case GRABBINGMODE_SCREENSAVER:
case GRABBINGMODE_INVALID:
// _grabber->setFlags(0);
start();
break;
case GRABBINGMODE_OFF:
stop();
break;
}
}
void AmlogicWrapper::setVideoMode(const VideoMode mode)
{
_grabber->setVideoMode(mode);

30
libsrc/grabber/dispmanx/DispmanxWrapper.cpp
View File

@@ -46,27 +46,17 @@ void DispmanxWrapper::action()
_hyperion->setColors(_priority, _ledColors, _timeout_ms);
}
void DispmanxWrapper::setGrabbingMode(const GrabbingMode mode)
void DispmanxWrapper::kodiPlay()
{
switch (mode)
{
case GRABBINGMODE_VIDEO:
case GRABBINGMODE_PAUSE:
_grabber->setFlags(DISPMANX_SNAPSHOT_NO_RGB|DISPMANX_SNAPSHOT_FILL);
start();
break;
case GRABBINGMODE_AUDIO:
case GRABBINGMODE_PHOTO:
case GRABBINGMODE_MENU:
case GRABBINGMODE_SCREENSAVER:
case GRABBINGMODE_INVALID:
_grabber->setFlags(0);
start();
break;
case GRABBINGMODE_OFF:
stop();
break;
}
_grabber->setFlags(DISPMANX_SNAPSHOT_NO_RGB|DISPMANX_SNAPSHOT_FILL);
GrabberWrapper::kodiPlay();
}
void DispmanxWrapper::kodiPause()
{
_grabber->setFlags(0);
GrabberWrapper::kodiPause();
}
void DispmanxWrapper::setVideoMode(const VideoMode mode)

19
libsrc/grabber/framebuffer/FramebufferWrapper.cpp
View File

@@ -40,25 +40,6 @@ void FramebufferWrapper::action()
_hyperion->setColors(_priority, _ledColors, _timeout_ms);
}
void FramebufferWrapper::setGrabbingMode(const GrabbingMode mode)
{
switch (mode)
{
case GRABBINGMODE_VIDEO:
case GRABBINGMODE_PAUSE:
case GRABBINGMODE_AUDIO:
case GRABBINGMODE_PHOTO:
case GRABBINGMODE_MENU:
case GRABBINGMODE_SCREENSAVER:
case GRABBINGMODE_INVALID:
start();
break;
case GRABBINGMODE_OFF:
stop();
break;
}
}
void FramebufferWrapper::setVideoMode(const VideoMode mode)
{
_grabber->setVideoMode(mode);

18
libsrc/grabber/osx/OsxWrapper.cpp
View File

@@ -40,24 +40,6 @@ void OsxWrapper::action()
_hyperion->setColors(_priority, _ledColors, _timeout_ms);
}
void OsxWrapper::setGrabbingMode(const GrabbingMode mode)
{
switch (mode)
{
case GRABBINGMODE_VIDEO:
case GRABBINGMODE_PAUSE:
case GRABBINGMODE_AUDIO:
case GRABBINGMODE_PHOTO:
case GRABBINGMODE_MENU:
case GRABBINGMODE_SCREENSAVER:
case GRABBINGMODE_INVALID:
start();
break;
case GRABBINGMODE_OFF:
stop();
break;
}
}
void OsxWrapper::setVideoMode(const VideoMode mode)
{

18
libsrc/grabber/x11/X11Wrapper.cpp
View File

@@ -73,24 +73,6 @@ void X11Wrapper::action()
_hyperion->setColors(_priority, _ledColors, _timeout_ms);
}
void X11Wrapper::setGrabbingMode(const GrabbingMode mode)
{
switch (mode)
{
case GRABBINGMODE_VIDEO:
case GRABBINGMODE_PAUSE:
case GRABBINGMODE_AUDIO:
case GRABBINGMODE_PHOTO:
case GRABBINGMODE_MENU:
case GRABBINGMODE_SCREENSAVER:
case GRABBINGMODE_INVALID:
start();
break;
case GRABBINGMODE_OFF:
stop();
break;
}
}
void X11Wrapper::setVideoMode(const VideoMode mode)
{