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

neutrino: use background MP instance in webtv mode

Browse Source
This commit is contained in:
[CST] Focus
2015-10-16 14:54:27 +03:00
parent c4197fb5f3
commit 75ae46a216
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/audio_select.cpp
View File

@@ -96,7 +96,7 @@ int CAudioSelectMenuHandler::doMenu ()
{ {
int mode = CNeutrinoApp::getInstance()->getMode(); int mode = CNeutrinoApp::getInstance()->getMode();
if (mode == NeutrinoMessages::mode_webtv) { if (mode == NeutrinoMessages::mode_webtv) {
CMoviePlayerGui::getInstance().selectAudioPid(); CMoviePlayerGui::getInstance(true).selectAudioPid();
return menu_return::RETURN_EXIT; return menu_return::RETURN_EXIT;
} }
CMenuWidget AudioSelector(LOCALE_AUDIOSELECTMENUE_HEAD, NEUTRINO_ICON_AUDIO, width); CMenuWidget AudioSelector(LOCALE_AUDIOSELECTMENUE_HEAD, NEUTRINO_ICON_AUDIO, width);

2
src/gui/infoviewer_bb.cpp
View File

@@ -238,7 +238,7 @@ void CInfoViewerBB::getBBButtonInfo()
if (text == g_Locale->getText(LOCALE_AUDIOSELECTMENUE_HEAD)) if (text == g_Locale->getText(LOCALE_AUDIOSELECTMENUE_HEAD))
text = ""; text = "";
if ((mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv || mode == NeutrinoMessages::mode_audio) && !CMoviePlayerGui::getInstance().timeshift) { if ((mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv || mode == NeutrinoMessages::mode_audio) && !CMoviePlayerGui::getInstance().timeshift) {
text = CMoviePlayerGui::getInstance().CurrentAudioName(); text = CMoviePlayerGui::getInstance(mode == NeutrinoMessages::mode_webtv).CurrentAudioName();
} else if (!g_RemoteControl->current_PIDs.APIDs.empty()) { } else if (!g_RemoteControl->current_PIDs.APIDs.empty()) {
int selected = g_RemoteControl->current_PIDs.PIDs.selected_apid; int selected = g_RemoteControl->current_PIDs.PIDs.selected_apid;
if (text.empty()){ if (text.empty()){

4
src/neutrino.cpp
View File

@@ -4283,7 +4283,7 @@ void CNeutrinoApp::StopSubtitles()
frameBuffer->paintBackground(); frameBuffer->paintBackground();
} }
if (mode == mode_webtv) if (mode == mode_webtv)
CMoviePlayerGui::getInstance().clearSubtitle(true); CMoviePlayerGui::getInstance(true).clearSubtitle(true);
} }
void CNeutrinoApp::StartSubtitles(bool show) void CNeutrinoApp::StartSubtitles(bool show)
@@ -4294,7 +4294,7 @@ void CNeutrinoApp::StartSubtitles(bool show)
dvbsub_start(0); dvbsub_start(0);
tuxtx_pause_subtitle(false); tuxtx_pause_subtitle(false);
if (mode == mode_webtv) if (mode == mode_webtv)
CMoviePlayerGui::getInstance().clearSubtitle(false); CMoviePlayerGui::getInstance(true).clearSubtitle(false);
} }
void CNeutrinoApp::SelectSubtitles() void CNeutrinoApp::SelectSubtitles()