update glcd

Conflicts:
	src/gui/movieplayer.h
	src/gui/weather_locations.h
	src/neutrino.cpp
This commit is contained in:
redblue-pkt
2020-06-19 23:56:12 +02:00
committed by Thilo Graf
parent 6435b167e5
commit 1b6f4fedf5
118 changed files with 6154 additions and 1538 deletions

View File

@@ -969,7 +969,7 @@ int CChannelList::show()
editMode(false);
#ifdef ENABLE_GRAPHLCD
nGLCD::unlockChannel();
cGLCD::unlockChannel();
#endif
#ifdef ENABLE_LCD4LINUX
LCD4l->RemoveFile("/tmp/lcd/menu");
@@ -2253,7 +2253,7 @@ void CChannelList::updateVfd()
#ifdef ENABLE_GRAPHLCD
if(g_settings.glcd_enable)
nGLCD::lockChannel(g_Locale->getText(LOCALE_BOUQUETLIST_HEAD), chan->getName().c_str(), 0);
cGLCD::lockChannel(g_Locale->getText(LOCALE_BOUQUETLIST_HEAD), chan->getName().c_str(), 0);
#endif
#ifdef ENABLE_LCD4LINUX
if (g_settings.lcd4l_support)