mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -67,6 +67,7 @@
|
||||
|
||||
|
||||
#include <system/settings.h>
|
||||
#include <system/helpers.h> //NI
|
||||
|
||||
#include <algorithm>
|
||||
#include <sys/stat.h>
|
||||
@@ -78,6 +79,10 @@
|
||||
extern cVideo * videoDecoder;
|
||||
|
||||
|
||||
//NI InfoIcons
|
||||
#include <gui/infoicons.h>
|
||||
extern CInfoIcons *InfoIcons;
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
bool comparePictureByDate (const CPicture& a, const CPicture& b)
|
||||
{
|
||||
@@ -200,7 +205,7 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
|
||||
videoDecoder->setBlank(true);
|
||||
|
||||
// Stop Sectionsd
|
||||
g_Sectionsd->setPauseScanning(true);
|
||||
//NI g_Sectionsd->setPauseScanning(true);
|
||||
}
|
||||
|
||||
// Save and Clear background
|
||||
@@ -210,6 +215,10 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
|
||||
frameBuffer->Clear();
|
||||
}
|
||||
|
||||
//NI
|
||||
printf("[pictureviewer.cpp] wakeup_hdd(%s)\n", g_settings.network_nfs_picturedir.c_str());
|
||||
wakeup_hdd(g_settings.network_nfs_picturedir.c_str(),true);
|
||||
|
||||
show();
|
||||
|
||||
// free picviewer mem
|
||||
@@ -220,7 +229,7 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
|
||||
CZapit::getInstance()->EnablePlayback(true);
|
||||
|
||||
// Start Sectionsd
|
||||
g_Sectionsd->setPauseScanning(false);
|
||||
//NI g_Sectionsd->setPauseScanning(false);
|
||||
}
|
||||
|
||||
// Restore previous background
|
||||
@@ -261,6 +270,7 @@ int CPictureViewerGui::show()
|
||||
|
||||
CAudioMute::getInstance()->enableMuteIcon(false);
|
||||
CInfoClock::getInstance()->enableInfoClock(false);
|
||||
InfoIcons->enableInfoIcons(false); //NI InfoIcons
|
||||
|
||||
while (loop)
|
||||
{
|
||||
@@ -647,6 +657,7 @@ int CPictureViewerGui::show()
|
||||
|
||||
CAudioMute::getInstance()->enableMuteIcon(true);
|
||||
CInfoClock::getInstance()->enableInfoClock(true);
|
||||
InfoIcons->enableInfoIcons(true); //NI InfoIcons
|
||||
|
||||
return(res);
|
||||
}
|
||||
|
Reference in New Issue
Block a user