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

fix compil without LCD4LINUX

Browse Source
This commit is contained in:
Jacek Jendrzej
2019-01-03 11:27:46 +01:00
parent 2cfd6b7f89
commit e97c8d03fe
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -560,9 +560,11 @@ bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &C
// add neccessary paths to v_path // add neccessary paths to v_path
v_path.clear(); v_path.clear();
#ifdef ENABLE_LCD4LINUX
if (lcd4l_mode) if (lcd4l_mode)
v_path.push_back(g_settings.lcd4l_logodir); v_path.push_back(g_settings.lcd4l_logodir);
v_path.push_back(g_settings.logo_hdd_dir); v_path.push_back(g_settings.logo_hdd_dir);
#endif
if (g_settings.logo_hdd_dir != LOGODIR_VAR) if (g_settings.logo_hdd_dir != LOGODIR_VAR)
v_path.push_back(LOGODIR_VAR); v_path.push_back(LOGODIR_VAR);
if (g_settings.logo_hdd_dir != LOGODIR) if (g_settings.logo_hdd_dir != LOGODIR)
@@ -663,9 +665,11 @@ bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &C
for (size_t f = 0; f < v_file.size(); f++) for (size_t f = 0; f < v_file.size(); f++)
{ {
#ifdef ENABLE_LCD4LINUX
// process g_settings.lcd4l_logodir // process g_settings.lcd4l_logodir
if (lcd4l_mode) if (lcd4l_mode)
v_path.push_back(g_settings.lcd4l_logodir + "/" + v_file[f] + fileType[i]); v_path.push_back(g_settings.lcd4l_logodir + "/" + v_file[f] + fileType[i]);
#endif
// process g_settings.logo_hdd_dir // process g_settings.logo_hdd_dir
v_path.push_back(g_settings.logo_hdd_dir + "/" + v_file[f] + fileType[i]); v_path.push_back(g_settings.logo_hdd_dir + "/" + v_file[f] + fileType[i]);
// process LOGODIR_VAR // process LOGODIR_VAR

4
src/gui/osd_setup.cpp
View File

@@ -68,9 +68,11 @@
#include <hardware/video.h> #include <hardware/video.h>
#ifdef ENABLE_LCD4LINUX
// lcd4l-support // lcd4l-support
#include "driver/lcd4l.h" #include "driver/lcd4l.h"
extern CLCD4l *LCD4l; extern CLCD4l *LCD4l;
#endif
extern CRemoteControl * g_RemoteControl; extern CRemoteControl * g_RemoteControl;
@@ -1578,10 +1580,12 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
CVolumeHelper::getInstance()->refresh(); CVolumeHelper::getInstance()->refresh();
return false; return false;
} }
#ifdef ENABLE_LCD4LINUX
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CHANNELLIST_SHOW_EVENTLOGO)) else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CHANNELLIST_SHOW_EVENTLOGO))
{ {
LCD4l->ResetParseID(); LCD4l->ResetParseID();
} }
#endif
else if ((ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_INFOCLOCK)) || else if ((ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_INFOCLOCK)) ||
(ARE_LOCALES_EQUAL(OptionName, LOCALE_CLOCK_SIZE_HEIGHT)) || (ARE_LOCALES_EQUAL(OptionName, LOCALE_CLOCK_SIZE_HEIGHT)) ||
(ARE_LOCALES_EQUAL(OptionName, LOCALE_CLOCK_SECONDS))) { (ARE_LOCALES_EQUAL(OptionName, LOCALE_CLOCK_SECONDS))) {