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

audioplay: clean up, add missing code for audio/internet player functionality

Browse Source 
* favorites handling
* auto play
* xml data/logo handling
* locales
* settings
* clean ups

taken from https://bitbucket.org/neutrino-images/ni-neutrino-hd
This commit is contained in:
Thilo Graf
2018-05-28 21:36:35 +02:00
parent 730a357368
commit 3ac8217d07
10 changed files with 163 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/screensaver.cpp
View File

@@ -47,6 +47,9 @@
#include <video.h>
extern cVideo * videoDecoder;
using namespace std;
CScreenSaver::CScreenSaver()
@@ -56,6 +59,7 @@ CScreenSaver::CScreenSaver()
index = 0;
status_mute = CAudioMute::getInstance()->getStatus();
scr_clock = NULL;
clr.i_color = COL_DARK_GRAY;
pip_channel_id = 0;
@@ -94,6 +98,9 @@ void CScreenSaver::Start()
if(!CInfoClock::getInstance()->isBlocked())
CInfoClock::getInstance()->disableInfoClock();
#ifdef ENABLE_PIP
pip_channel_id = CZapit::getInstance()->GetPipChannelID();
if (pip_channel_id)
@@ -135,6 +142,7 @@ void CScreenSaver::Stop()
m_frameBuffer->paintBackground(); //clear entire screen
CAudioMute::getInstance()->enableMuteIcon(status_mute);
if (!OnAfterStop.empty()){
OnAfterStop();
@@ -195,6 +203,8 @@ bool CScreenSaver::ReadDir()
string d;
if (show_audiocover)
d = COVERDIR_TMP;
else
d = g_settings.screensaver_dir;
if (d.length() > 1)
{
//remove trailing slash
@@ -299,8 +309,7 @@ void CScreenSaver::paint()
}
else{
if (!scr_clock){
scr_clock = new CComponentsFrmClock(1, 1, NULL, "%H:%M:%S", "%H:%M %S", true,
1, NULL, CC_SHADOW_OFF, COL_BLACK, COL_BLACK);
scr_clock = new CComponentsFrmClock(1, 1, NULL, "%H:%M:%S", "%H:%M %S", true, 1, NULL, CC_SHADOW_OFF, COL_BLACK, COL_BLACK);
scr_clock->setCornerType(CORNER_NONE);
scr_clock->setClockFont(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]);
scr_clock->disableSaveBg();