From db4ec25e60921805a8f31f7d23f1462d68120348 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Sat, 16 Jan 2016 14:29:42 +0100 Subject: [PATCH] CScreenSaver: Fix compile when pip is disabled Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8d58e43499b8d7136c5dd2e9b8ac8f2cc8c1d9cb Author: Michael Liebmann Date: 2016-01-16 (Sat, 16 Jan 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/screensaver.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/gui/screensaver.cpp b/src/gui/screensaver.cpp index 573464767..c6fe0d0f2 100644 --- a/src/gui/screensaver.cpp +++ b/src/gui/screensaver.cpp @@ -22,6 +22,9 @@ along with this program. If not, see . */ +#ifdef HAVE_CONFIG_H +#include +#endif #include #include @@ -88,9 +91,11 @@ void CScreenSaver::Start() if(!CInfoClock::getInstance()->isBlocked()) CInfoClock::getInstance()->disableInfoClock(); +#ifdef ENABLE_PIP pip_channel_id = CZapit::getInstance()->GetPipChannelID(); if (pip_channel_id) 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); @@ -127,10 +132,12 @@ void CScreenSaver::Stop() scr_clock = NULL; } +#ifdef ENABLE_PIP if(pip_channel_id) { CNeutrinoApp::getInstance()->StartPip(pip_channel_id); pip_channel_id = 0; } +#endif m_frameBuffer->paintBackground(); //clear entire screen