diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp index e5537e5b9..014c9ce08 100644 --- a/src/gui/pictureviewer.cpp +++ b/src/gui/pictureviewer.cpp @@ -168,9 +168,9 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey) #ifdef ENABLE_GRAPHLCD cGLCD::MirrorOSD(false); - channel = g_Locale->getText(LOCALE_PICTUREVIEWER_HEAD); - epg = ""; - cGLCD::lockChannel(channel, epg, 0); + glcd_channel = g_Locale->getText(LOCALE_PICTUREVIEWER_HEAD); + glcd_epg = ""; + cGLCD::lockChannel(glcd_channel, glcd_epg, 0); #endif width = frameBuffer->getWindowWidth(); @@ -601,8 +601,8 @@ int CPictureViewerGui::show() nfsMenu.exec(this, ""); update=true; #ifdef ENABLE_GRAPHLCD - epg = ""; - cGLCD::lockChannel(channel, epg, 0); + glcd_epg = ""; + cGLCD::lockChannel(glcd_channel, glcd_epg, 0); #endif 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; #ifdef ENABLE_GRAPHLCD - epg = playlist[index].Name.c_str(); - cGLCD::lockChannel(channel, epg, 0); + glcd_epg = playlist[index].Name.c_str(); + cGLCD::lockChannel(glcd_channel, glcd_epg, 0); #endif CVFD::getInstance()->showMenuText(0, playlist[index].Name.c_str()); char timestring[19]; @@ -873,8 +873,8 @@ void CPictureViewerGui::thrView() void CPictureViewerGui::endView() { #ifdef ENABLE_GRAPHLCD - epg = ""; - cGLCD::lockChannel(channel, epg, 0); + glcd_epg = ""; + cGLCD::lockChannel(glcd_channel, glcd_epg, 0); #endif if (m_state != MENU) @@ -890,8 +890,8 @@ 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); + glcd_epg = playlist[index].Name.c_str(); + cGLCD::lockChannel(glcd_channel, glcd_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) diff --git a/src/gui/pictureviewer.h b/src/gui/pictureviewer.h index be4793102..7ee500df4 100644 --- a/src/gui/pictureviewer.h +++ b/src/gui/pictureviewer.h @@ -87,8 +87,8 @@ class CPictureViewerGui : public CMenuTarget std::string Path; #ifdef ENABLE_GRAPHLCD - std::string channel; - std::string epg; + std::string glcd_channel; + std::string glcd_epg; #endif int width;