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

screensaver: disable pictureviewer handling

Browse Source 
Sadly so we lost the possibility to show photos, but the display of photos is broken since last rework because the savescreen handling saves the wrong data.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 58dc8f6c69
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-01-05 (Sun, 05 Jan 2020)

Origin message was:
------------------
- screensaver: disable pictureviewer handling

Sadly so we lost the possibility to show photos, but the display of photos is broken since last rework because the savescreen handling saves the wrong data.


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-01-05 22:22:22 +01:00
parent 6baddb4c50
commit bc0cc5a831
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/screensaver.cpp
View File

@@ -62,7 +62,8 @@ CScreenSaver::CScreenSaver()
{
thrScreenSaver = NULL;
m_frameBuffer = CFrameBuffer::getInstance();
m_viewer = new CPictureViewer();
//m_viewer = new CPictureViewer();
index = 0;
status_mute = CAudioMute::getInstance()->getStatus();
status_icons = CInfoIcons::getInstance()->getStatus(); //NI
@@ -82,7 +83,7 @@ CScreenSaver::~CScreenSaver()
{
thrExit();
delete m_viewer;
//delete m_viewer;
if (scr_clock){
delete scr_clock;
@@ -138,6 +139,7 @@ void CScreenSaver::Start()
g_Zapit->stopPip();
#endif
/*
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);
@@ -147,13 +149,8 @@ void CScreenSaver::Start()
m_viewer->SetAspectRatio(float(4.0/3));
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();
if(!thrScreenSaver)
@@ -192,13 +189,14 @@ void CScreenSaver::Stop()
#endif
m_frameBuffer->paintBackground(); //clear entire screen
CInfoIcons::getInstance()->enableInfoIcons(status_icons); //NI
CAudioMute::getInstance()->enableMuteIcon(status_mute);
CInfoClock::getInstance()->ClearDisplay(); //provokes reinit
CInfoClock::getInstance()->enableInfoClock();
CInfoIcons::getInstance()->enableInfoIcons(status_icons); //NI
if (g_RadiotextWin)
g_Radiotext->OnAfterDecodeLine.unblock();
@@ -376,8 +374,8 @@ void CScreenSaver::paint()
#if 0
hideRadioText();
#endif
//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_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*/);
#if 1
handleRadioText();
#endif

2
src/gui/screensaver.h
View File

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