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

pictureviewer/glcd: align code

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: feaa436457
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-07-02 (Thu, 02 Jul 2020)

Origin message was:
------------------
- pictureviewer/glcd: align code

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-07-02 00:24:13 +02:00
parent 1277a3431e
commit 9d2d88b19c
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/pictureviewer.cpp
View File

@@ -168,9 +168,9 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
cGLCD::MirrorOSD(false); cGLCD::MirrorOSD(false);
channel = g_Locale->getText(LOCALE_PICTUREVIEWER_HEAD); glcd_channel = g_Locale->getText(LOCALE_PICTUREVIEWER_HEAD);
epg = ""; glcd_epg = "";
cGLCD::lockChannel(channel, epg, 0); cGLCD::lockChannel(glcd_channel, glcd_epg, 0);
#endif #endif
width = frameBuffer->getWindowWidth(); width = frameBuffer->getWindowWidth();
@@ -601,8 +601,8 @@ int CPictureViewerGui::show()
nfsMenu.exec(this, ""); nfsMenu.exec(this, "");
update=true; update=true;
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
epg = ""; glcd_epg = "";
cGLCD::lockChannel(channel, epg, 0); cGLCD::lockChannel(glcd_channel, glcd_epg, 0);
#endif #endif
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_PICTUREVIEWER_HEAD)); CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_PICTUREVIEWER_HEAD));
} }
@@ -819,8 +819,8 @@ void CPictureViewerGui::view(unsigned int index, bool unscaled)
selected=index; selected=index;
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
epg = playlist[index].Name.c_str(); glcd_epg = playlist[index].Name.c_str();
cGLCD::lockChannel(channel, epg, 0); cGLCD::lockChannel(glcd_channel, glcd_epg, 0);
#endif #endif
CVFD::getInstance()->showMenuText(0, playlist[index].Name.c_str()); CVFD::getInstance()->showMenuText(0, playlist[index].Name.c_str());
char timestring[19]; char timestring[19];
@@ -873,8 +873,8 @@ void CPictureViewerGui::thrView()
void CPictureViewerGui::endView() void CPictureViewerGui::endView()
{ {
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
epg = ""; glcd_epg = "";
cGLCD::lockChannel(channel, epg, 0); cGLCD::lockChannel(glcd_channel, glcd_epg, 0);
#endif #endif
if (m_state != MENU) if (m_state != MENU)
@@ -890,8 +890,8 @@ void CPictureViewerGui::endView()
void CPictureViewerGui::deletePicFile(unsigned int index, bool mode) void CPictureViewerGui::deletePicFile(unsigned int index, bool mode)
{ {
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
epg = playlist[index].Name.c_str(); glcd_epg = playlist[index].Name.c_str();
cGLCD::lockChannel(channel, epg, 0); cGLCD::lockChannel(glcd_channel, glcd_epg, 0);
#endif #endif
CVFD::getInstance()->showMenuText(0, playlist[index].Name.c_str()); 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) if (ShowMsg(LOCALE_FILEBROWSER_DELETE, playlist[index].Filename, CMsgBox::mbrNo, CMsgBox::mbYes|CMsgBox::mbNo)==CMsgBox::mbrYes)

4
src/gui/pictureviewer.h
View File

@@ -87,8 +87,8 @@ class CPictureViewerGui : public CMenuTarget
std::string Path; std::string Path;
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
std::string channel; std::string glcd_channel;
std::string epg; std::string glcd_epg;
#endif #endif
int width; int width;