From f19f1641fb1c3bca53a14ead805790bddffb9c3d Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Thu, 8 Mar 2012 20:55:49 +0100 Subject: [PATCH] neutrino: do not build in incompatibly licensed code Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2e06c23b99b6fe141642fd2e545b19c5d4ffd0cd Author: Stefan Seyfried Date: 2012-03-08 (Thu, 08 Mar 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/osd_setup.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index fc0f4ff7c..244b2aabf 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -52,7 +52,9 @@ #include #include +#ifdef SCREENSHOT #include +#endif #include #include @@ -421,10 +423,12 @@ int COsdSetup::showOsdSetup() showOsdChanlistSetup(osd_menu_chanlist); osd_menu->addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, osd_menu_chanlist, NULL, CRCInput::RC_2)); +#ifdef SCREENSHOT //screenshot CMenuWidget *osd_menu_screenshot = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_SCREENSHOT); showOsdScreenshottSetup(osd_menu_screenshot); osd_menu->addItem( new CMenuForwarder(LOCALE_SCREENSHOT_MENU, true, NULL, osd_menu_screenshot, NULL, CRCInput::RC_3)); +#endif //monitor //CScreenPresetNotifier * presetNotify = new CScreenPresetNotifier(); @@ -716,6 +720,7 @@ int COsdSetup::showContextChanlistMenu() return res; } +#ifdef SCREENSHOT //screenshot #define SCREENSHOT_FMT_OPTION_COUNT 3 const CMenuOptionChooser::keyval_ext SCREENSHOT_FMT_OPTIONS[SCREENSHOT_FMT_OPTION_COUNT] = @@ -746,3 +751,4 @@ void COsdSetup::showOsdScreenshottSetup(CMenuWidget *menu_screenshot) } +#endif