mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
screensaver: disable pip while screensaver
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87db52784f
Author: defans <defans@bluepeercrew.us>
Date: 2016-01-16 (Sat, 16 Jan 2016)
Origin message was:
------------------
- screensaver: disable pip while screensaver
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -38,7 +38,7 @@
|
||||
#include "screensaver.h"
|
||||
#include <system/debug.h>
|
||||
#include <gui/infoclock.h>
|
||||
|
||||
#include <zapit/zapit.h>
|
||||
|
||||
#include <video.h>
|
||||
extern cVideo * videoDecoder;
|
||||
@@ -54,6 +54,7 @@ CScreenSaver::CScreenSaver()
|
||||
status_mute = CAudioMute::getInstance()->getStatus();
|
||||
scr_clock = NULL;
|
||||
clr.i_color = COL_DARK_GRAY;
|
||||
pip_channel_id = 0;
|
||||
}
|
||||
|
||||
CScreenSaver::~CScreenSaver()
|
||||
@@ -87,6 +88,10 @@ void CScreenSaver::Start()
|
||||
if(!CInfoClock::getInstance()->isBlocked())
|
||||
CInfoClock::getInstance()->disableInfoClock();
|
||||
|
||||
pip_channel_id = CZapit::getInstance()->GetPipChannelID();
|
||||
if (pip_channel_id)
|
||||
g_Zapit->stopPip();
|
||||
|
||||
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);
|
||||
|
||||
@@ -122,6 +127,11 @@ void CScreenSaver::Stop()
|
||||
scr_clock = NULL;
|
||||
}
|
||||
|
||||
if(pip_channel_id) {
|
||||
CNeutrinoApp::getInstance()->StartPip(pip_channel_id);
|
||||
pip_channel_id = 0;
|
||||
}
|
||||
|
||||
m_frameBuffer->paintBackground(); //clear entire screen
|
||||
|
||||
CAudioMute::getInstance()->enableMuteIcon(status_mute);
|
||||
|
Reference in New Issue
Block a user