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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/upnpbrowser.cpp


Origin commit data
------------------
Commit: 2f3793fa1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-24 (Thu, 24 Nov 2016)
This commit is contained in:
vanhofen
2016-11-24 21:45:31 +01:00
parent a2f404e939 cf6c9b99d9
commit 56879044cb
6 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/movieplayer.cpp
View File

@@ -228,8 +228,6 @@ void CMoviePlayerGui::cutNeutrino()
CZapit::getInstance()->setMoviePlayer(true);// let CCamManager::SetMode know, the call is from MoviePlayer
g_Zapit->lockPlayBack();
//NI if (!isWebTV)
//NI g_Sectionsd->setPauseScanning(true);
m_LastMode = (CNeutrinoApp::getInstance()->getMode() /*| NeutrinoMessages::norezap*/);
if (isWebTV)
@@ -252,7 +250,6 @@ void CMoviePlayerGui::restoreNeutrino()
//g_Zapit->unlockPlayBack();
CZapit::getInstance()->EnablePlayback(true);
//NI g_Sectionsd->setPauseScanning(false);
printf("%s: restore mode %x\n", __func__, m_LastMode);fflush(stdout);
#if 0