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

screensaver: try to fix display of audiocovers <-> own pictures

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 923fdb0542
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-05-31 (Thu, 31 May 2018)

Origin message was:
------------------
- screensaver: try to fix display of audiocovers <-> own pictures

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-05-31 00:57:37 +02:00
parent 81e429d201
commit b1341c0016
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/screensaver.cpp
View File

@@ -116,8 +116,14 @@ 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();
m_viewer->ShowImage(ICONSDIR "/blackscreen.jpg", false /*unscaled*/); // hack to get sure we have a blank screen
if(!thrScreenSaver) if(!thrScreenSaver)
{ {
@@ -188,8 +194,21 @@ void* CScreenSaver::ScreenSaverPrg(void* arg)
bool CScreenSaver::ReadDir() bool CScreenSaver::ReadDir()
{ {
string d; bool show_audiocover = false;
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_audio && g_settings.audioplayer_cover_as_screensaver) if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_audio && g_settings.audioplayer_cover_as_screensaver)
{
if (access(COVERDIR, F_OK) == 0)
{
struct dirent **coverlist;
int n = scandir(COVERDIR, &coverlist, 0, alphasort);
if (n > 2) // we always have the "." and ".." entrys
show_audiocover = true;
}
}
string d;
if (show_audiocover)
d = COVERDIR; d = COVERDIR;
else else
d = g_settings.screensaver_dir; d = g_settings.screensaver_dir;