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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b6f2568ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-07 (Sat, 07 Oct 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-07 10:52:18 +02:00
parent f8279b3fab 6893c77389
commit 39f90ef9e7
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/channellist.cpp
View File

@@ -2109,9 +2109,6 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
} }
if (!firstpaint && curr == selected) if (!firstpaint && curr == selected)
updateVfd(); updateVfd();
//NI lcd4l-support
if(g_settings.lcd4l_support)
LCD4l->CreateFile("/tmp/lcd/menu", chan->getName().c_str(), g_settings.lcd4l_convert);
} }
} }
@@ -2135,6 +2132,10 @@ void CChannelList::updateVfd()
CVFD::getInstance()->showMenuText(0, nameAndDescription, -1, true); // UTF-8 CVFD::getInstance()->showMenuText(0, nameAndDescription, -1, true); // UTF-8
} else } else
CVFD::getInstance()->showMenuText(0, chan->getName().c_str(), -1, true); // UTF-8 CVFD::getInstance()->showMenuText(0, chan->getName().c_str(), -1, true); // UTF-8
//NI lcd4l-support
if (g_settings.lcd4l_support)
LCD4l->CreateFile("/tmp/lcd/menu", chan->getName().c_str(), g_settings.lcd4l_convert);
} }
void CChannelList::paint() void CChannelList::paint()

4
src/gui/lcd4l_setup.cpp
View File

@@ -143,6 +143,10 @@ int CLCD4lSetup::show()
mc->setHint(NEUTRINO_ICON_HINT_LCD4L, LOCALE_MENU_HINT_LCD4L_SKIN); mc->setHint(NEUTRINO_ICON_HINT_LCD4L, LOCALE_MENU_HINT_LCD4L_SKIN);
lcd4lSetup->addItem(mc); lcd4lSetup->addItem(mc);
mc = new CMenuOptionChooser(LOCALE_LCD4L_SKIN_RADIO, &g_settings.lcd4l_skin_radio, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++));
mc->setHint(NEUTRINO_ICON_HINT_LCD4L, LOCALE_MENU_HINT_LCD4L_SKIN_RADIO);
lcd4lSetup->addItem(mc);
const char *flag_lcd4l_weather = FLAGDIR "/.lcd-weather"; const char *flag_lcd4l_weather = FLAGDIR "/.lcd-weather";
int fake_lcd4l_weather = file_exists(flag_lcd4l_weather); int fake_lcd4l_weather = file_exists(flag_lcd4l_weather);
CTouchFileNotifier * lcd_weather = new CTouchFileNotifier(flag_lcd4l_weather); CTouchFileNotifier * lcd_weather = new CTouchFileNotifier(flag_lcd4l_weather);