mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 16:01:20 +02:00
- 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:
@@ -968,6 +968,9 @@ int CChannelList::show()
|
||||
if (edit_state)
|
||||
editMode(false);
|
||||
|
||||
#ifdef ENABLE_GRAPHLCD
|
||||
nGLCD::unlockChannel();
|
||||
#endif
|
||||
#ifdef ENABLE_LCD4LINUX
|
||||
LCD4l->RemoveFile("/tmp/lcd/menu");
|
||||
#endif
|
||||
@@ -2247,6 +2250,10 @@ void CChannelList::updateVfd()
|
||||
} else
|
||||
CVFD::getInstance()->showMenuText(0, chan->getName().c_str(), -1, true); // UTF-8
|
||||
|
||||
#ifdef ENABLE_GRAPHLCD
|
||||
if(g_settings.glcd_enable)
|
||||
nGLCD::lockChannel(g_Locale->getText(LOCALE_BOUQUETLIST_HEAD), chan->getName().c_str(), 0);
|
||||
#endif
|
||||
#ifdef ENABLE_LCD4LINUX
|
||||
if (g_settings.lcd4l_support)
|
||||
LCD4l->CreateFile("/tmp/lcd/menu", chan->getName().c_str(), g_settings.lcd4l_convert);
|
||||
|
Reference in New Issue
Block a user