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

movieplayer: revert most code from terrible commit 7fcd8dea4c

Browse Source 
to get back working subtitles for COOL_HARDWARE


Origin commit data
------------------
Commit: 9704c796b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- movieplayer: revert most code from terrible commit 7fcd8dea4c

to get back working subtitles for COOL_HARDWARE
This commit is contained in:
vanhofen
2018-01-03 11:55:54 +01:00
parent 1680bde4b8
commit 7cb1943adf
3 changed files with 90 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/neutrino.cpp
View File

@@ -2975,11 +2975,9 @@ void CNeutrinoApp::RealRun()
if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF)
CRecordManager::getInstance()->exec(NULL, "Record");
}
#if 0
else if ((mode == NeutrinoModes::mode_webtv) && msg == (neutrino_msg_t) g_settings.mpkey_subtitle) {
CMoviePlayerGui::getInstance(true).selectSubtitle();
}
#endif
/* after sensitive key bind, check user menu */
else if (usermenu.showUserMenu(msg)) {
}
@@ -3350,12 +3348,10 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
}
return messages_return::handled;
}
#if 0
if (mode == NeutrinoModes::mode_webtv && msg == NeutrinoMessages::EVT_SUBT_MESSAGE) {
CMoviePlayerGui::getInstance(true).showSubtitle(data);
return messages_return::handled;
}
#endif
if (msg == NeutrinoMessages::EVT_AUTO_SET_VIDEOSYSTEM) {
printf(">>>>>[CNeutrinoApp::%s:%d] Receive EVT_AUTO_SET_VIDEOSYSTEM message\n", __func__, __LINE__);
COsdHelpers *coh = COsdHelpers::getInstance();
@@ -5185,10 +5181,8 @@ void CNeutrinoApp::StopSubtitles()
tuxtx_pause_subtitle(true);
frameBuffer->paintBackground();
}
#if 0
if (mode == NeutrinoModes::mode_webtv)
CMoviePlayerGui::getInstance(true).clearSubtitle(true);
#endif
}
void CNeutrinoApp::StartSubtitles(bool show)
@@ -5198,10 +5192,8 @@ void CNeutrinoApp::StartSubtitles(bool show)
return;
dvbsub_start(0);
tuxtx_pause_subtitle(false);
#if 0
if (mode == NeutrinoModes::mode_webtv)
CMoviePlayerGui::getInstance(true).clearSubtitle(false);
#endif
}
void CNeutrinoApp::SelectSubtitles()