- pick graphlcd support from DDT but include it in another way

Conflicts:
	src/driver/Makefile.am
	src/driver/nglcd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/system/settings.h

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2019-10-26 22:37:38 +02:00
committed by Thilo Graf
parent 30dbfb7ec9
commit f0240d89a0
27 changed files with 888 additions and 19 deletions

View File

@@ -594,6 +594,10 @@ int CBouquetList::show(bool bShowChannelList)
}
hide();
#ifdef ENABLE_GRAPHLCD
nGLCD::unlockChannel();
#endif
#ifdef ENABLE_LCD4LINUX
LCD4l->RemoveFile("/tmp/lcd/menu");
#endif
@@ -655,6 +659,10 @@ void CBouquetList::paintItem(int pos)
{
if(npos < (int) Bouquets.size())
CVFD::getInstance()->showMenuText(0, lname, -1, true);
#ifdef ENABLE_GRAPHLCD
if(g_settings.glcd_enable)
nGLCD::lockChannel(g_Locale->getText(LOCALE_BOUQUETLIST_HEAD), lname, 0);
#endif
#ifdef ENABLE_LCD4LINUX
if(g_settings.lcd4l_support)
LCD4l->CreateFile("/tmp/lcd/menu", lname, g_settings.lcd4l_convert);