update glcd

Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c2dcc9eb1
Author: redblue-pkt <redblue-pkt@orange.pl>
Date: 2020-06-19 (Fri, 19 Jun 2020)


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

------------------
This commit was generated by Migit
This commit is contained in:
redblue-pkt
2020-06-19 23:56:12 +02:00
committed by vanhofen
parent 29edb1b24a
commit 3aaa9c30d9
118 changed files with 6113 additions and 1533 deletions

View File

@@ -166,6 +166,13 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
selected = 0;
#ifdef ENABLE_GRAPHLCD
cGLCD::MirrorOSD(false);
channel = g_Locale->getText(LOCALE_PICTUREVIEWER_HEAD);
epg = "";
cGLCD::lockChannel(channel, epg, 0);
#endif
width = frameBuffer->getWindowWidth();
height = frameBuffer->getWindowHeight();
@@ -243,6 +250,11 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
if (m_LastMode == NeutrinoModes::mode_ts)
videoDecoder->setBlank(false);
#ifdef ENABLE_GRAPHLCD
cGLCD::MirrorOSD(g_settings.glcd_mirror_osd);
cGLCD::unlockChannel();
#endif
// always exit all
return menu_return::RETURN_REPAINT;
}
@@ -588,6 +600,10 @@ int CPictureViewerGui::show()
CNFSSmallMenu nfsMenu;
nfsMenu.exec(this, "");
update=true;
#ifdef ENABLE_GRAPHLCD
epg = "";
cGLCD::lockChannel(channel, epg, 0);
#endif
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_PICTUREVIEWER_HEAD));
}
}
@@ -802,6 +818,10 @@ void CPictureViewerGui::view(unsigned int index, bool unscaled)
m_unscaled = unscaled;
selected=index;
#ifdef ENABLE_GRAPHLCD
epg = playlist[index].Name.c_str();
cGLCD::lockChannel(channel, epg, 0);
#endif
CVFD::getInstance()->showMenuText(0, playlist[index].Name.c_str());
char timestring[19];
strftime(timestring, 18, "%d-%m-%Y %H:%M", gmtime(&playlist[index].Date));
@@ -852,6 +872,11 @@ void CPictureViewerGui::thrView()
void CPictureViewerGui::endView()
{
#ifdef ENABLE_GRAPHLCD
epg = "";
cGLCD::lockChannel(channel, epg, 0);
#endif
if (m_state != MENU)
m_state=MENU;
@@ -864,6 +889,10 @@ void CPictureViewerGui::endView()
void CPictureViewerGui::deletePicFile(unsigned int index, bool mode)
{
#ifdef ENABLE_GRAPHLCD
epg = playlist[index].Name.c_str();
cGLCD::lockChannel(channel, epg, 0);
#endif
CVFD::getInstance()->showMenuText(0, playlist[index].Name.c_str());
if (ShowMsg(LOCALE_FILEBROWSER_DELETE, playlist[index].Filename, CMsgBox::mbrNo, CMsgBox::mbYes|CMsgBox::mbNo)==CMsgBox::mbrYes)
{