mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

fb_generic.cpp: fix build for CST hardware...

Browse Source 
was broken with commit 8b7de5f
This commit is contained in:
GetAway
2019-01-22 21:37:38 +01:00
parent 9a8d5657f7
commit c14b34fe54
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/driver/fb_generic.cpp
View File

@@ -1549,6 +1549,14 @@ void CFrameBuffer::Clear()
bool CFrameBuffer::showFrame(const std::string & filename, bool fallback) bool CFrameBuffer::showFrame(const std::string & filename, bool fallback)
{ {
std::string picture = getIconPath(filename, ""); std::string picture = getIconPath(filename, "");
#if HAVE_COOL_HARDWARE
(void)fallback;
if (access(picture.c_str(), F_OK) == 0)
{
videoDecoder->ShowPicture(picture.c_str());
return true;
}
#else
if (access(picture.c_str(), F_OK) == 0) if (access(picture.c_str(), F_OK) == 0)
{ {
if (videoDecoder->ShowPicture(picture.c_str())) if (videoDecoder->ShowPicture(picture.c_str()))
@@ -1562,6 +1570,7 @@ bool CFrameBuffer::showFrame(const std::string & filename, bool fallback)
dprintf(DEBUG_NORMAL,"[CFrameBuffer]\[%s - %d], fallback is disabled, paint of image was stopped: %s\n", __func__, __LINE__, picture.c_str()); dprintf(DEBUG_NORMAL,"[CFrameBuffer]\[%s - %d], fallback is disabled, paint of image was stopped: %s\n", __func__, __LINE__, picture.c_str());
} }
} }
#endif
else else
dprintf(DEBUG_NORMAL,"[CFrameBuffer]\[%s - %d], image not found: %s\n", __func__, __LINE__, picture.c_str()); dprintf(DEBUG_NORMAL,"[CFrameBuffer]\[%s - %d], image not found: %s\n", __func__, __LINE__, picture.c_str());

4
src/gui/screensaver.cpp
View File

@@ -301,11 +301,7 @@ void CScreenSaver::paint()
} }
dprintf(DEBUG_INFO, "[CScreenSaver] %s - %d : %s\n", __func__, __LINE__, v_bg_files.at(index).c_str()); dprintf(DEBUG_INFO, "[CScreenSaver] %s - %d : %s\n", __func__, __LINE__, v_bg_files.at(index).c_str());
#if HAVE_ARM_HARDWARE
m_frameBuffer->showFrame(v_bg_files.at(index), true); m_frameBuffer->showFrame(v_bg_files.at(index), true);
#else
paintImage(v_bg_files.at(index), 0, 0, m_frameBuffer->getScreenWidth(true), m_frameBuffer->getScreenHeight(true));
#endif
if (!g_settings.screensaver_random) if (!g_settings.screensaver_random)
index++; index++;