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

neutrino: do not build in incompatibly licensed code

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e06c23b99
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-08 (Thu, 08 Mar 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-03-08 20:55:49 +01:00
parent 3ebf5c38b6
commit f19f1641fb
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/osd_setup.cpp
View File

@@ -52,7 +52,9 @@
#include <gui/widget/stringinput.h> #include <gui/widget/stringinput.h>
#include <driver/screen_max.h> #include <driver/screen_max.h>
#ifdef SCREENSHOT
#include <driver/screenshot.h> #include <driver/screenshot.h>
#endif
#include <driver/volume.h> #include <driver/volume.h>
#include <system/debug.h> #include <system/debug.h>
@@ -421,10 +423,12 @@ int COsdSetup::showOsdSetup()
showOsdChanlistSetup(osd_menu_chanlist); showOsdChanlistSetup(osd_menu_chanlist);
osd_menu->addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, osd_menu_chanlist, NULL, CRCInput::RC_2)); osd_menu->addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_CHANNELLIST, true, NULL, osd_menu_chanlist, NULL, CRCInput::RC_2));
#ifdef SCREENSHOT
//screenshot //screenshot
CMenuWidget *osd_menu_screenshot = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_SCREENSHOT); CMenuWidget *osd_menu_screenshot = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_SCREENSHOT);
showOsdScreenshottSetup(osd_menu_screenshot); showOsdScreenshottSetup(osd_menu_screenshot);
osd_menu->addItem( new CMenuForwarder(LOCALE_SCREENSHOT_MENU, true, NULL, osd_menu_screenshot, NULL, CRCInput::RC_3)); osd_menu->addItem( new CMenuForwarder(LOCALE_SCREENSHOT_MENU, true, NULL, osd_menu_screenshot, NULL, CRCInput::RC_3));
#endif
//monitor //monitor
//CScreenPresetNotifier * presetNotify = new CScreenPresetNotifier(); //CScreenPresetNotifier * presetNotify = new CScreenPresetNotifier();
@@ -716,6 +720,7 @@ int COsdSetup::showContextChanlistMenu()
return res; return res;
} }
#ifdef SCREENSHOT
//screenshot //screenshot
#define SCREENSHOT_FMT_OPTION_COUNT 3 #define SCREENSHOT_FMT_OPTION_COUNT 3
const CMenuOptionChooser::keyval_ext SCREENSHOT_FMT_OPTIONS[SCREENSHOT_FMT_OPTION_COUNT] = const CMenuOptionChooser::keyval_ext SCREENSHOT_FMT_OPTIONS[SCREENSHOT_FMT_OPTION_COUNT] =
@@ -746,3 +751,4 @@ void COsdSetup::showOsdScreenshottSetup(CMenuWidget *menu_screenshot)
} }
#endif