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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	acinclude.m4


Origin commit data
------------------
Branch: ni/coolstream
Commit: a9842aa1d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-26 23:25:43 +02:00
parent 515913eecd ad129ee746
commit 4a4762935b
17 changed files with 214 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/movieplayer.cpp
View File

@@ -38,6 +38,7 @@
#include <gui/epgview.h>
#include <gui/eventlist.h>
#include <gui/movieplayer.h>
#include <gui/osd_helpers.h>
#include <gui/infoviewer.h>
#include <gui/timeosd.h>
#include <gui/widget/helpbox.h>
@@ -157,6 +158,8 @@ void CMoviePlayerGui::Init(void)
{
playing = false;
stopped = true;
currentVideoSystem = -1;
currentOsdResolution = 0;
frameBuffer = CFrameBuffer::getInstance();
@@ -242,6 +245,12 @@ void CMoviePlayerGui::cutNeutrino()
if (playing)
return;
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
COsdHelpers *coh = COsdHelpers::getInstance();
currentVideoSystem = coh->getVideoSystem();
currentOsdResolution = coh->getOsdResolution();
#endif
playing = true;
/* set g_InfoViewer update timer to 1 sec, should be reset to default from restoreNeutrino->set neutrino mode */
if (!isWebTV)
@@ -277,6 +286,17 @@ void CMoviePlayerGui::restoreNeutrino()
if (!playing)
return;
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
if ((currentVideoSystem > -1) && (g_settings.video_Mode == VIDEO_STD_AUTO)) {
COsdHelpers *coh = COsdHelpers::getInstance();
if (currentVideoSystem != coh->getVideoSystem()) {
coh->setVideoSystem(currentVideoSystem, false);
coh->changeOsdResolution(currentOsdResolution, false, true);
}
currentVideoSystem = -1;
}
#endif
playing = false;
#ifdef HAVE_AZBOX_HARDWARE
g_Zapit->setStandby(false);