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

audioplayer: move videodecoder/pain away from screensaver() function

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: dec7d42ffe
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-29 (Mon, 29 Dec 2014)

Origin message was:
------------------
- audioplayer: move videodecoder/pain away from screensaver() function

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2014-12-29 21:27:44 +01:00
parent 09dd6563ef
commit f991a57571
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/audioplayer.cpp
View File

@@ -384,6 +384,11 @@ int CAudioPlayerGui::show()
if (m_screensaver) if (m_screensaver)
{ {
screensaver(false); screensaver(false);
videoDecoder->StopPicture();
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/mp3.jpg");
paint();
if (msg <= CRCInput::RC_MaxRC) { if (msg <= CRCInput::RC_MaxRC) {
// ignore first keypress - just quit the screensaver // ignore first keypress - just quit the screensaver
g_RCInput->clearRCMsg(); g_RCInput->clearRCMsg();
@@ -706,11 +711,11 @@ int CAudioPlayerGui::show()
picture->exec(this, "audio"); picture->exec(this, "audio");
delete picture; delete picture;
pictureviewer = false; pictureviewer = false;
screensaver(false);
videoDecoder->setBlank(true); videoDecoder->setBlank(true);
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/mp3.jpg"); videoDecoder->ShowPicture(DATADIR "/neutrino/icons/mp3.jpg");
CVFD::getInstance()->setMode(CVFD::MODE_AUDIO); CVFD::getInstance()->setMode(CVFD::MODE_AUDIO);
paintLCD(); paintLCD();
screensaver(false);
} }
else if (msg == CRCInput::RC_help) else if (msg == CRCInput::RC_help)
{ {
@@ -2212,9 +2217,6 @@ void CAudioPlayerGui::screensaver(bool on)
{ {
CScreenSaver::getInstance()->Stop(); CScreenSaver::getInstance()->Stop();
m_screensaver = false; m_screensaver = false;
videoDecoder->StopPicture();
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/mp3.jpg");
paint();
m_idletime = time(NULL); m_idletime = time(NULL);
} }
} }