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

Revert "- screensaver: disable pictureviewer handling"

Browse Source 
This reverts commit bc0cc5a831.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 93cd57f6c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-01-25 (Sat, 25 Jan 2020)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-01-25 22:06:47 +01:00
parent dc1e9d2cdb
commit a1a13ff7f7
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/screensaver.cpp
View File

@@ -63,8 +63,7 @@ CScreenSaver::CScreenSaver()
{ {
thrScreenSaver = NULL; thrScreenSaver = NULL;
m_frameBuffer = CFrameBuffer::getInstance(); m_frameBuffer = CFrameBuffer::getInstance();
//m_viewer = new CPictureViewer(); m_viewer = new CPictureViewer();
index = 0; index = 0;
status_mute = CAudioMute::getInstance()->getStatus(); status_mute = CAudioMute::getInstance()->getStatus();
status_icons = CInfoIcons::getInstance()->getStatus(); //NI status_icons = CInfoIcons::getInstance()->getStatus(); //NI
@@ -84,7 +83,7 @@ CScreenSaver::~CScreenSaver()
{ {
thrExit(); thrExit();
//delete m_viewer; delete m_viewer;
if (scr_clock){ if (scr_clock){
delete scr_clock; delete scr_clock;
@@ -140,7 +139,6 @@ void CScreenSaver::Start()
g_Zapit->stopPip(); g_Zapit->stopPip();
#endif #endif
/*
m_viewer->SetScaling((CPictureViewer::ScalingMode)g_settings.picviewer_scaling); m_viewer->SetScaling((CPictureViewer::ScalingMode)g_settings.picviewer_scaling);
m_viewer->SetVisible(g_settings.screen_StartX, g_settings.screen_EndX, g_settings.screen_StartY, g_settings.screen_EndY); m_viewer->SetVisible(g_settings.screen_StartX, g_settings.screen_EndX, g_settings.screen_StartY, g_settings.screen_EndY);
@@ -150,8 +148,13 @@ void CScreenSaver::Start()
m_viewer->SetAspectRatio(float(4.0/3)); m_viewer->SetAspectRatio(float(4.0/3));
m_viewer->Cleanup(); m_viewer->Cleanup();
#if HAVE_ARM_HARDWARE
/*
Hack to get sure we have a blank screen.
stopFrame()-function seems not work correctly on ARM_HARDWARE
*/ */
m_frameBuffer->showFrame("blackscreen.jpg");
#endif
m_frameBuffer->stopFrame(); m_frameBuffer->stopFrame();
if(!thrScreenSaver) if(!thrScreenSaver)
@@ -190,14 +193,13 @@ void CScreenSaver::Stop()
#endif #endif
m_frameBuffer->paintBackground(); //clear entire screen m_frameBuffer->paintBackground(); //clear entire screen
CInfoIcons::getInstance()->enableInfoIcons(status_icons); //NI
CAudioMute::getInstance()->enableMuteIcon(status_mute); CAudioMute::getInstance()->enableMuteIcon(status_mute);
CInfoClock::getInstance()->ClearDisplay(); //provokes reinit CInfoClock::getInstance()->ClearDisplay(); //provokes reinit
CInfoClock::getInstance()->enableInfoClock(); CInfoClock::getInstance()->enableInfoClock();
CInfoIcons::getInstance()->enableInfoIcons(status_icons); //NI
if (g_RadiotextWin) if (g_RadiotextWin)
g_Radiotext->OnAfterDecodeLine.unblock(); g_Radiotext->OnAfterDecodeLine.unblock();
@@ -375,8 +377,8 @@ void CScreenSaver::paint()
#if 0 #if 0
hideRadioText(); hideRadioText();
#endif #endif
m_frameBuffer->showFrame(v_bg_files.at(index), CFrameBuffer::SHOW_FRAME_FALLBACK_MODE_IMAGE); //m_frameBuffer->showFrame(v_bg_files.at(index), CFrameBuffer::SHOW_FRAME_FALLBACK_MODE_IMAGE);
//m_viewer->ShowImage(v_bg_files.at(index).c_str(), false /*unscaled*/); m_viewer->ShowImage(v_bg_files.at(index).c_str(), false /*unscaled*/);
#if 1 #if 1
handleRadioText(); handleRadioText();
#endif #endif

2
src/gui/screensaver.h
View File

@@ -38,7 +38,7 @@ class CScreenSaver : public sigc::trackable
{ {
private: private:
CFrameBuffer *m_frameBuffer; CFrameBuffer *m_frameBuffer;
//CPictureViewer *m_viewer; CPictureViewer *m_viewer;
std::thread *thrScreenSaver; std::thread *thrScreenSaver;
static void ScreenSaverPrg(CScreenSaver *scr); static void ScreenSaverPrg(CScreenSaver *scr);