mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'uncool/cst-next'

Browse Source
This commit is contained in:
Stefan Seyfried
2015-12-28 16:15:14 +01:00
parent b5821890d2 92b579b3c6
commit b837d8697b
122 changed files with 5543 additions and 2589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/audioplayer.cpp
View File

@@ -70,7 +70,7 @@
#include <gui/screensaver.h>
#include "gui/pictureviewer.h"
extern CPictureViewer * g_PicViewer;
#include <gui/infoclock.h>
#include <system/settings.h>
#include <system/helpers.h>
#include <driver/screen_max.h>
@@ -335,7 +335,8 @@ int CAudioPlayerGui::show()
// clear whole screen
m_frameBuffer->paintBackground();
CInfoClock::getInstance()->block();
CScreenSaver::getInstance()->OnAfterStop.connect(sigc::mem_fun(CInfoClock::getInstance(), &CInfoClock::block));
CVFD::getInstance()->setMode(CVFD::MODE_AUDIO);
paintLCD();
@@ -849,7 +850,8 @@ int CAudioPlayerGui::show()
if (m_state != CAudioPlayerGui::STOP)
stop();
CInfoClock::getInstance()->enableInfoClock(CInfoClock::getInstance()->isRun());
CScreenSaver::getInstance()->OnAfterStop.clear();
return ret;
}