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

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

Browse Source 
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: 5f256432c9
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-07 (Tue, 07 Nov 2017)
This commit is contained in:
gixxpunk
2017-11-07 20:16:30 +01:00
parent 831064a464 d1e2d57359
commit ae8431ac3f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/movieplayer.cpp
View File

@@ -359,10 +359,11 @@ void CMoviePlayerGui::restoreNeutrino()
if (isUPNP) if (isUPNP)
return; return;
#if ! HAVE_COOL_HARDWARE
g_Zapit->unlockPlayBack(); g_Zapit->unlockPlayBack();
//CZapit::getInstance()->EnablePlayback(true); #else
CZapit::getInstance()->EnablePlayback(true);
#endif
printf("%s: restore mode %x\n", __func__, m_LastMode);fflush(stdout); printf("%s: restore mode %x\n", __func__, m_LastMode);fflush(stdout);
#if 0 #if 0
if (m_LastMode == NeutrinoMessages::mode_tv) if (m_LastMode == NeutrinoMessages::mode_tv)
@@ -1866,7 +1867,6 @@ void CMoviePlayerGui::PlayFileLoop(void)
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
} else if (msg == (neutrino_msg_t) g_settings.mpkey_next3dmode) { } else if (msg == (neutrino_msg_t) g_settings.mpkey_next3dmode) {
frameBuffer->set3DMode((CFrameBuffer::Mode3D)(((frameBuffer->get3DMode()) + 1) % CFrameBuffer::Mode3D_SIZE)); frameBuffer->set3DMode((CFrameBuffer::Mode3D)(((frameBuffer->get3DMode()) + 1) % CFrameBuffer::Mode3D_SIZE));
#endif
} else if (msg == (neutrino_msg_t) g_settings.key_next43mode) { } else if (msg == (neutrino_msg_t) g_settings.key_next43mode) {
g_videoSettings->next43Mode(); g_videoSettings->next43Mode();
} else if (msg == (neutrino_msg_t) g_settings.key_switchformat) { } else if (msg == (neutrino_msg_t) g_settings.key_switchformat) {