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: add possibility to handle with unscaled images in showFrame()

Browse Source
This commit is contained in:
Thilo Graf
2020-02-05 22:03:12 +01:00
parent d5c0e2ec97
commit b42bf6109b
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/driver/fb_generic.cpp
View File

@@ -1576,7 +1576,7 @@ bool CFrameBuffer::showFrame(const std::string & filename, int fallback_mode)
std::string picture = getIconPath(filename, ""); std::string picture = getIconPath(filename, "");
bool ret = false; bool ret = false;
if (access(picture.c_str(), F_OK) == 0) if (access(picture.c_str(), F_OK) == 0 && !(fallback_mode & SHOW_FRAME_FALLBACK_MODE_IMAGE_UNSCALED))
{ {
if (videoDecoder) if (videoDecoder)
{ {
@@ -1593,16 +1593,28 @@ bool CFrameBuffer::showFrame(const std::string & filename, int fallback_mode)
} }
else else
{ {
dprintf(DEBUG_NORMAL,"[CFrameBuffer]\[%s - %d], image not found: %s\n", __func__, __LINE__, picture.c_str()); if (!(fallback_mode & SHOW_FRAME_FALLBACK_MODE_IMAGE_UNSCALED))
picture = ""; {
dprintf(DEBUG_NORMAL,"[CFrameBuffer]\[%s - %d], image not found: %s\n", __func__, __LINE__, picture.c_str());
picture = "";
}
} }
if (!ret) if (!ret)
{ {
if (fallback_mode) if (fallback_mode)
{ {
if ((fallback_mode & SHOW_FRAME_FALLBACK_MODE_IMAGE) && !picture.empty()) if (fallback_mode & (SHOW_FRAME_FALLBACK_MODE_IMAGE | SHOW_FRAME_FALLBACK_MODE_IMAGE_UNSCALED) && !picture.empty())
ret = g_PicViewer->DisplayImage(picture, 0, 0, getScreenWidth(true), getScreenHeight(true), TM_NONE); {
if (fallback_mode & SHOW_FRAME_FALLBACK_MODE_IMAGE_UNSCALED)
{
SetTransparent(TM_NONE);
ret = g_PicViewer->ShowImage(picture.c_str(), false);
SetTransparentDefault();
}
else
ret = g_PicViewer->DisplayImage(picture, 0, 0, getScreenWidth(true), getScreenHeight(true), TM_NONE);
}
else else
ret = false; ret = false;

5
src/driver/fb_generic.h
View File

@@ -271,8 +271,9 @@ class CFrameBuffer : public sigc::trackable
{ {
SHOW_FRAME_FALLBACK_MODE_OFF = 0, SHOW_FRAME_FALLBACK_MODE_OFF = 0,
SHOW_FRAME_FALLBACK_MODE_IMAGE = 1, SHOW_FRAME_FALLBACK_MODE_IMAGE = 1,
SHOW_FRAME_FALLBACK_MODE_BLACKSCREEN = 2, SHOW_FRAME_FALLBACK_MODE_IMAGE_UNSCALED = 2,
SHOW_FRAME_FALLBACK_MODE_CALLBACK = 4 SHOW_FRAME_FALLBACK_MODE_BLACKSCREEN = 4,
SHOW_FRAME_FALLBACK_MODE_CALLBACK = 8
}; };
bool showFrame(const std::string & filename, int fallback_mode = SHOW_FRAME_FALLBACK_MODE_OFF); bool showFrame(const std::string & filename, int fallback_mode = SHOW_FRAME_FALLBACK_MODE_OFF);
void stopFrame(); void stopFrame();