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

show event logos only in infoviewer

Browse Source
This commit is contained in:
TangoCash
2018-12-25 01:12:16 +01:00
committed by Thilo Graf
parent 1d0d8ade9c
commit 93f74ef829
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -529,7 +529,7 @@ void CPictureViewer::getSize(const char* name, int* width, int *height)
}
}
bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &ChannelName, std::string &name, int *width, int *height, bool lcd4l_mode)
bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &ChannelName, std::string &name, int *width, int *height, bool lcd4l_mode, bool enable_event_logo)
{
std::string fileType[] = { ".png", ".jpg", ".gif" };
std::vector<std::string> v_path;
@@ -538,7 +538,7 @@ bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &C
// create eventname for eventlogos; Note: We don't process channellogos if any eventlogo was found.
std::string EventName = "";
int mode = CNeutrinoApp::getInstance()->getMode();
if (ChannelID || mode == NeutrinoModes::mode_ts)
if (enable_event_logo && (ChannelID || mode == NeutrinoModes::mode_ts))
{
// TODO: fix eventlogo in moviebrowser

2
src/driver/pictureviewer/pictureviewer.h
View File

@@ -67,7 +67,7 @@ class CPictureViewer
static double m_aspect_ratio_correction;
bool DisplayImage (const std::string & name, int posx, int posy, int width, int height, int transp=0 /*CFrameBuffer::TM_EMPTY*/);
// bool DisplayLogo (uint64_t channel_id, int posx, int posy, int width, int height);
bool GetLogoName(const uint64_t &ChannelID, const std::string &ChannelName, std::string &name, int *width = NULL, int *height = NULL, bool lcd4l_mode = false);
bool GetLogoName(const uint64_t &ChannelID, const std::string &ChannelName, std::string &name, int *width = NULL, int *height = NULL, bool lcd4l_mode = false, bool enable_event_logo = false);
fb_pixel_t * getImage (const std::string & name, int width, int height);
fb_pixel_t * getIcon (const std::string & name, int *width, int *height);
void getSize(const char *name, int* width, int *height);