mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-05 04:38:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

- neutrino: unify modes handling; ...

Browse Source 
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2017-11-20 15:19:06 +01:00
committed by Thilo Graf
parent 1f86b6aa62
commit 0fc3e793a4
28 changed files with 233 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/pictureviewer.cpp
View File

@@ -191,7 +191,7 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
// remember last mode
m_LastMode = CNeutrinoApp::getInstance()->getMode();
// tell neutrino we're in pic_mode
CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , NeutrinoMessages::mode_pic );
CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , NeutrinoModes::mode_pic );
if (!audioplayer) { // !!! why? !!!
CNeutrinoApp::getInstance()->stopPlayBack(true);
@@ -226,7 +226,7 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
// Restore last mode
CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , m_LastMode );
if (m_LastMode == NeutrinoMessages::mode_ts)
if (m_LastMode == NeutrinoModes::mode_ts)
videoDecoder->setBlank(false);
// always exit all
@@ -608,7 +608,7 @@ int CPictureViewerGui::show()
}
else if (msg == NeutrinoMessages::CHANGEMODE)
{
if ((data & NeutrinoMessages::mode_mask) !=NeutrinoMessages::mode_pic)
if ((data & NeutrinoModes::mode_mask) !=NeutrinoModes::mode_pic)
{
loop = false;
m_LastMode=data;