From f061d0973e3b9dcb76d4ce28c95576c76d0a5bc9 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 Nov 2017 08:48:54 +0100 Subject: [PATCH] fix another merge error vol.2 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/ee3599ea6abc41dad602339a0259e9c4c1c36c62 Author: vanhofen Date: 2017-11-03 (Fri, 03 Nov 2017) Origin message was: ------------------ - fix another merge error vol.2 --- src/gui/movieplayer.cpp | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index d5b0b46cc..53bd6a153 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -2855,27 +2855,6 @@ void CMoviePlayerGui::StopSubtitles(bool enable_glcd_mirroring __attribute__((un #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() { Helpbox helpbox(g_Locale->getText(LOCALE_MESSAGEBOX_INFO));