mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

fb_generic: simplify showFrame()

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 33256507f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-10-29 (Fri, 29 Oct 2021)

Origin message was:
------------------
- fb_generic: simplify showFrame()

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-10-29 20:01:01 +02:00
parent d2cc1fcfb8
commit 6004493a21
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/driver/fb_generic.cpp
View File

@@ -1589,7 +1589,13 @@ bool CFrameBuffer::showFrame(const std::string & filename, int fallback_mode)
std::string picture = getIconPath(filename);
bool ret = false;
if (access(picture.c_str(), F_OK) == 0 && !(fallback_mode & SHOW_FRAME_FALLBACK_MODE_IMAGE_UNSCALED))
if (picture.empty())
{
dprintf(DEBUG_NORMAL,"[CFrameBuffer]\[%s - %d], image not found: %s\n", __func__, __LINE__, filename.c_str());
return ret;
}
if (!(fallback_mode & SHOW_FRAME_FALLBACK_MODE_IMAGE_UNSCALED))
{
if (videoDecoder)
{
@@ -1604,14 +1610,6 @@ bool CFrameBuffer::showFrame(const std::string & filename, int fallback_mode)
else
dprintf(DEBUG_NORMAL,"[CFrameBuffer]\[%s - %d], no videoplayer instance available\n", __func__, __LINE__);
}
else
{
if (!(fallback_mode & SHOW_FRAME_FALLBACK_MODE_IMAGE_UNSCALED))
{
dprintf(DEBUG_NORMAL,"[CFrameBuffer]\[%s - %d], image not found: %s\n", __func__, __LINE__, picture.c_str());
picture = "";
}
}
if (!ret)
{