mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix another merge error vol.2

Browse Source 
Origin commit data
------------------
Commit: ee3599ea6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix another merge error vol.2
This commit is contained in:
vanhofen
2017-11-03 08:48:54 +01:00
parent dbc81968f9
commit f061d0973e
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/movieplayer.cpp
View File

@@ -2855,27 +2855,6 @@ void CMoviePlayerGui::StopSubtitles(bool enable_glcd_mirroring __attribute__((un
#endif #endif
} }
void CMoviePlayerGui::StopSubtitles(bool enable_glcd_mirroring __attribute__((unused)))
{
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
printf("[CMoviePlayerGui] %s\n", __FUNCTION__);
int ttx, ttxpid, ttxpage;
int current_sub = playback->GetSubtitlePid();
if (current_sub > -1)
dvbsub_pause();
tuxtx_subtitle_running(&ttxpid, &ttxpage, &ttx);
if (ttx) {
tuxtx_pause_subtitle(true);
frameBuffer->paintBackground();
}
#ifdef ENABLE_GRAPHLCD
if (enable_glcd_mirroring)
nGLCD::MirrorOSD(g_settings.glcd_mirror_osd);
#endif
#endif
}
void CMoviePlayerGui::showHelp() void CMoviePlayerGui::showHelp()
{ {
Helpbox helpbox(g_Locale->getText(LOCALE_MESSAGEBOX_INFO)); Helpbox helpbox(g_Locale->getText(LOCALE_MESSAGEBOX_INFO));