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

- move quadpip-setup to videosettings

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-10-17 21:38:28 +02:00
committed by Thilo Graf
parent caaa27e39f
commit 8d39e55753
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/videosettings.cpp
View File

@@ -72,6 +72,9 @@ extern cVideo *videoDecoder;
extern cVideo *pipVideoDecoder[3]; extern cVideo *pipVideoDecoder[3];
#include <gui/pipsetup.h> #include <gui/pipsetup.h>
#endif #endif
#if ENABLE_QUADPIP
#include <gui/quadpip_setup.h>
#endif
extern int prev_video_mode; extern int prev_video_mode;
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
@@ -535,6 +538,12 @@ int CVideoSettings::showVideoSetup()
videosetup->addItem(pipsetup); videosetup->addItem(pipsetup);
#endif #endif
#if ENABLE_QUADPIP
CMenuForwarder *quadpip = new CMenuForwarder(LOCALE_QUADPIP, g_info.hw_caps->pip_devs >= 1, NULL, new CQuadPiPSetup());
quadpip->setHint(NEUTRINO_ICON_HINT_QUADPIP, LOCALE_MENU_HINT_QUADPIP);
videosetup->addItem(quadpip);
#endif
if (file_exists("/proc/stb/video/zapmode")) { if (file_exists("/proc/stb/video/zapmode")) {
CMenuOptionChooser * zm = new CMenuOptionChooser(LOCALE_VIDEOMENU_ZAPPINGMODE, &g_settings.zappingmode, VIDEOMENU_ZAPPINGMODE_OPTIONS, VIDEOMENU_ZAPPINGMODE_OPTION_COUNT, true, this); CMenuOptionChooser * zm = new CMenuOptionChooser(LOCALE_VIDEOMENU_ZAPPINGMODE, &g_settings.zappingmode, VIDEOMENU_ZAPPINGMODE_OPTIONS, VIDEOMENU_ZAPPINGMODE_OPTION_COUNT, true, this);
zm->setHint("", LOCALE_MENU_HINT_VIDEO_ZAPPINGMODE); zm->setHint("", LOCALE_MENU_HINT_VIDEO_ZAPPINGMODE);

12
src/neutrino_menue.cpp
View File

@@ -68,9 +68,6 @@
#include "gui/sleeptimer.h" #include "gui/sleeptimer.h"
#include "gui/timerlist.h" #include "gui/timerlist.h"
#include "gui/update_menue.h" #include "gui/update_menue.h"
#if ENABLE_QUADPIP
#include <gui/quadpip_setup.h>
#endif
#ifdef ENABLE_TESTING #ifdef ENABLE_TESTING
#include "gui/test_menu.h" #include "gui/test_menu.h"
#endif #endif
@@ -272,15 +269,6 @@ void CNeutrinoApp::InitMenuMain()
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_CISETTINGS]); personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_CISETTINGS]);
} }
#if ENABLE_QUADPIP
// temp, only for testing, changed later
if (g_info.hw_caps->pip_devs >= 1) {
CMenuForwarder *quadpip = new CMenuForwarder(LOCALE_QUADPIP, true, NULL, new CQuadPiPSetup(), NULL, CRCInput::RC_nokey);
quadpip->setHint(NEUTRINO_ICON_HINT_QUADPIP, LOCALE_MENU_HINT_QUADPIP);
personalize.addItem(MENU_MAIN, quadpip/*, &g_settings.personalize[SNeutrinoSettings::P_MAIN_QUADPIP]*/);
}
#endif
#ifdef ENABLE_TESTING #ifdef ENABLE_TESTING
personalize.addItem(MENU_MAIN, new CMenuForwarder("Test menu", true, NULL, new CTestMenu()), NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); personalize.addItem(MENU_MAIN, new CMenuForwarder("Test menu", true, NULL, new CTestMenu()), NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO);
#endif #endif