From 2bcb7b43015b9a1fe1c1cf4653642f9341156da6 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 Nov 2017 09:36:19 +0100 Subject: [PATCH] movieplayer: fix new mode Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/098f021a3ccdedb65ead926b9810b38cbb3ab279 Author: vanhofen Date: 2017-11-03 (Fri, 03 Nov 2017) Origin message was: ------------------ - movieplayer: fix new mode Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- src/gui/movieplayer.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index d35793bc8..8cec9abd0 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -296,12 +296,19 @@ void CMoviePlayerGui::cutNeutrino() g_Zapit->setStandby(true); #endif - m_LastMode = (CNeutrinoApp::getInstance()->getMode() /*| NeutrinoMessages::norezap*/); + int new_mode = NeutrinoMessages::mode_unknown; + m_LastMode = CNeutrinoApp::getInstance()->getMode(); if (isWebTV) + { + new_mode = (m_LastMode == NeutrinoMessages::mode_radio) ? NeutrinoMessages::mode_webradio : NeutrinoMessages::mode_webtv; m_LastMode |= NeutrinoMessages::norezap; + } + else + { + new_mode = NeutrinoMessages::mode_ts; + } printf("%s: save mode %x\n", __func__, m_LastMode);fflush(stdout); - int new_mode = NeutrinoMessages::norezap | (isWebTV ? NeutrinoMessages::mode_webtv : NeutrinoMessages::mode_ts); - CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::CHANGEMODE, new_mode); + CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::CHANGEMODE, NeutrinoMessages::norezap | new_mode); } void CMoviePlayerGui::restoreNeutrino()