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

configure: depending --enable-quadpip on --enable-pip

Browse Source 
* unify ENABLE_PIP defines
* simplify ENABLE_QUADPIP defines


Origin commit data
------------------
Commit: 866ababb79
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-10-16 (Sat, 16 Oct 2021)

Origin message was:
------------------
- configure: depending --enable-quadpip on --enable-pip

* unify ENABLE_PIP defines
* simplify ENABLE_QUADPIP defines
This commit is contained in:
vanhofen
2021-10-16 22:08:35 +02:00
parent 67e6e30a9e
commit 89d5b8105c
17 changed files with 68 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/videosettings.cpp
View File

@@ -68,7 +68,7 @@
#endif
extern cVideo *videoDecoder;
#ifdef ENABLE_PIP
#if ENABLE_PIP
extern cVideo *pipVideoDecoder[3];
#include <gui/pipsetup.h>
#endif
@@ -528,7 +528,7 @@ int CVideoSettings::showVideoSetup()
sd->setHint("", LOCALE_MENU_HINT_VIDEO_SDOSD);
videosetup->addItem(sd);
#endif
#ifdef ENABLE_PIP
#if ENABLE_PIP
CPipSetup pip;
CMenuForwarder * pipsetup = new CMenuForwarder(LOCALE_VIDEOMENU_PIP, g_info.hw_caps->can_pip, NULL, &pip);
pipsetup->setHint("", LOCALE_MENU_HINT_VIDEO_PIP);
@@ -611,7 +611,7 @@ void CVideoSettings::setVideoSettings()
videoDecoder->setAspectRatio(g_settings.video_Format, -1);
#endif
videoDecoder->setAspectRatio(g_settings.video_Format, g_settings.video_43mode);
#ifdef ENABLE_PIP
#if ENABLE_PIP
if (pipVideoDecoder[0] != NULL)
pipVideoDecoder[0]->setAspectRatio(g_settings.video_Format, g_settings.video_43mode);
#endif
@@ -625,7 +625,7 @@ void CVideoSettings::setVideoSettings()
changeNotify(LOCALE_VIDEOMENU_SATURATION, NULL);
changeNotify(LOCALE_VIDEOMENU_SDOSD, NULL);
#endif
#ifdef ENABLE_PIP
#if ENABLE_PIP
if (pipVideoDecoder[0] != NULL)
pipVideoDecoder[0]->Pig(g_settings.pip_x, g_settings.pip_y, g_settings.pip_width, g_settings.pip_height, g_settings.screen_width, g_settings.screen_height);
#endif
@@ -689,7 +689,7 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /*
g_Zapit->setMode43(g_settings.video_43mode);
videoDecoder->setAspectRatio(g_settings.video_Format, -1);
#ifdef ENABLE_PIP
#if ENABLE_PIP
if (pipVideoDecoder[0] != NULL)
pipVideoDecoder[0]->setAspectRatio(g_settings.video_Format, g_settings.video_43mode);
#endif
@@ -758,7 +758,7 @@ void CVideoSettings::next43Mode(void)
text = videomenu_43mode_options[curmode].value;
g_settings.video_43mode = videomenu_43mode_options[curmode].key;
g_Zapit->setMode43(g_settings.video_43mode);
#ifdef ENABLE_PIP
#if ENABLE_PIP
if (pipVideoDecoder[0] != NULL)
pipVideoDecoder[0]->setAspectRatio(-1, g_settings.video_43mode);
#endif
@@ -786,7 +786,7 @@ void CVideoSettings::SwitchFormat()
g_settings.video_Format = VIDEOMENU_VIDEOFORMAT_OPTIONS[curmode].key;
videoDecoder->setAspectRatio(g_settings.video_Format, -1);
#ifdef ENABLE_PIP
#if ENABLE_PIP
if (pipVideoDecoder[0] != NULL)
pipVideoDecoder[0]->setAspectRatio(g_settings.video_Format, -1);
#endif