From 6f700d80c0aa3a5cea62c5121deb041c95bfea54 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 4 Nov 2013 22:00:06 +0100 Subject: [PATCH] CTestMenu: add configure option --enable-testmenu --- configure.ac | 6 ++++++ src/gui/Makefile.am | 6 +++++- src/gui/test_menu.cpp | 3 +-- src/neutrino_menue.cpp | 4 +++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index fd211fdb9..6d617f9ef 100644 --- a/configure.ac +++ b/configure.ac @@ -127,6 +127,12 @@ AC_ARG_ENABLE(pip, [AC_DEFINE(ENABLE_PIP,1,[enable picture in picture support])]) +AM_CONDITIONAL(ENABLE_TEST_MENU,test "$enable_testmenu" = "yes") +if test "$enable_testmenu" = "yes"; then + AC_DEFINE(ENABLE_TEST_MENU,1,[include test menu in neutrino main menu - not recommended for general users!]) +fi + + if test "$BOXTYPE" = "coolstream"; then if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the header file.]) diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 37dd4915a..ec2ff3afd 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -95,7 +95,6 @@ libneutrino_gui_a_SOURCES = \ start_wizard.cpp \ streaminfo2.cpp \ subchannel_select.cpp \ - test_menu.cpp \ themes.cpp \ timeosd.cpp \ update.cpp \ @@ -109,6 +108,11 @@ libneutrino_gui_a_SOURCES = \ volumebar.cpp \ zapit_setup.cpp +if ENABLE_TEST_MENU +libneutrino_gui_a_SOURCES += \ + test_menu.cpp +endif + libneutrino_gui2_a_SOURCES = \ cam_menu.cpp \ color.cpp \ diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp index 106a8c5a4..2eb8e2aa8 100644 --- a/src/gui/test_menu.cpp +++ b/src/gui/test_menu.cpp @@ -58,7 +58,7 @@ extern int cs_test_card(int unit, char * str); -#ifdef TEST_MENU + CTestMenu::CTestMenu() { width = w_max (50, 10); @@ -737,4 +737,3 @@ void CTestMenu::showHWTests(CMenuWidget *widget) } CFEManager::getInstance()->linkFrontends(true); } -#endif diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index dfef56f8b..77481348a 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -71,7 +71,9 @@ #include "gui/sleeptimer.h" #include "gui/update_menue.h" #include "gui/streaminfo2.h" +#ifdef ENABLE_TEST_MENU #include "gui/test_menu.h" +#endif #include "gui/update.h" #include "gui/vfd_setup.h" #include "driver/record.h" @@ -280,7 +282,7 @@ void CNeutrinoApp::InitMenuMain() } } -#ifdef TEST_MENU +#ifdef ENABLE_TEST_MENU personalize.addItem(MENU_MAIN, new CMenuForwarderNonLocalized("Test menu", true, NULL, new CTestMenu()), NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); #endif }