mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- movieplayer: remove unused ENABLE_GRAPHLCD code

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2017-12-26 23:27:33 +01:00
committed by Thilo Graf
parent bacddeea90
commit 55b49bebd9
1 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/gui/movieplayer.cpp
View File

@@ -82,10 +82,6 @@
#include <iconv.h> #include <iconv.h>
#include <libdvbsub/dvbsub.h> #include <libdvbsub/dvbsub.h>
#include <audio.h> #include <audio.h>
#ifdef ENABLE_GRAPHLCD
#include <driver/nglcd.h>
bool glcd_play = false;
#endif
#include <gui/widget/stringinput_ext.h> #include <gui/widget/stringinput_ext.h>
#include <gui/screensetup.h> #include <gui/screensetup.h>
#include <gui/widget/msgbox.h> #include <gui/widget/msgbox.h>
@@ -1382,15 +1378,6 @@ bool CMoviePlayerGui::PlayFileStart(void)
file_prozent = 0; file_prozent = 0;
#if HAVE_SPARK_HARDWARE #if HAVE_SPARK_HARDWARE
old3dmode = frameBuffer->get3DMode(); old3dmode = frameBuffer->get3DMode();
#endif
#ifdef ENABLE_GRAPHLCD
nGLCD::MirrorOSD(false);
if (p_movie_info)
nGLCD::lockChannel(p_movie_info->channelName, p_movie_info->epgTitle);
else {
glcd_play = true;
nGLCD::lockChannel(g_Locale->getText(LOCALE_MOVIEPLAYER_HEAD), file_name.c_str(), file_prozent);
}
#endif #endif
pthread_t thrStartHint = 0; pthread_t thrStartHint = 0;
if (is_file_player) { if (is_file_player) {
@@ -1593,14 +1580,6 @@ void CMoviePlayerGui::PlayFileLoop(void)
#endif #endif
while (playstate >= CMoviePlayerGui::PLAY) while (playstate >= CMoviePlayerGui::PLAY)
{ {
#ifdef ENABLE_GRAPHLCD
if (p_movie_info)
nGLCD::lockChannel(p_movie_info->channelName, p_movie_info->epgTitle, duration ? (100 * position / duration) : 0);
else {
glcd_play = true;
nGLCD::lockChannel(g_Locale->getText(LOCALE_MOVIEPLAYER_HEAD), file_name.c_str(), file_prozent);
}
#endif
if (update_lcd) { if (update_lcd) {
update_lcd = false; update_lcd = false;
updateLcd(); updateLcd();
@@ -2196,12 +2175,6 @@ void CMoviePlayerGui::PlayFileEnd(bool restore)
frameBuffer->set3DMode(old3dmode); frameBuffer->set3DMode(old3dmode);
CScreenSetup cSS; CScreenSetup cSS;
cSS.showBorder(CZapit::getInstance()->GetCurrentChannelID()); cSS.showBorder(CZapit::getInstance()->GetCurrentChannelID());
#endif
#ifdef ENABLE_GRAPHLCD
if (p_movie_info || glcd_play == true) {
glcd_play = false;
nGLCD::unlockChannel();
}
#endif #endif
if (iso_file) { if (iso_file) {
iso_file = false; iso_file = false;
@@ -2280,10 +2253,6 @@ void CMoviePlayerGui::callInfoViewer(bool init_vzap_it)
} }
if (!movie_info.channelName.empty() || !movie_info.epgTitle.empty()) if (!movie_info.channelName.empty() || !movie_info.epgTitle.empty())
p_movie_info = &movie_info; p_movie_info = &movie_info;
#ifdef ENABLE_GRAPHLCD
if (p_movie_info)
nGLCD::lockChannel(p_movie_info->channelName, p_movie_info->epgTitle);
#endif
} }
if (p_movie_info) { if (p_movie_info) {
@@ -2806,10 +2775,6 @@ void CMoviePlayerGui::StopSubtitles(bool enable_glcd_mirroring __attribute__((un
tuxtx_pause_subtitle(true); tuxtx_pause_subtitle(true);
frameBuffer->paintBackground(); frameBuffer->paintBackground();
} }
#ifdef ENABLE_GRAPHLCD
if (enable_glcd_mirroring)
nGLCD::MirrorOSD(g_settings.glcd_mirror_osd);
#endif
#endif #endif
} }
@@ -2847,9 +2812,6 @@ void CMoviePlayerGui::StartSubtitles(bool show __attribute__((unused)))
{ {
#if HAVE_SPARK_HARDWARE #if HAVE_SPARK_HARDWARE
printf("[CMoviePlayerGui] %s: %s\n", __FUNCTION__, show ? "Show" : "Not show"); printf("[CMoviePlayerGui] %s: %s\n", __FUNCTION__, show ? "Show" : "Not show");
#ifdef ENABLE_GRAPHLCD
nGLCD::MirrorOSD(false);
#endif
if(!show) if(!show)
return; return;