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

Revert "- allow to force given osd resolution in "videosystem = auto" mode"

Browse Source 
This reverts commit b9472250c3.


Origin commit data
------------------
Commit: 5ce34d5cf9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)
This commit is contained in:
Michael Liebmann
2017-03-12 06:32:52 +01:00
parent bd2ffd04f3
commit f9abc1c985
9 changed files with 25 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/osd_setup.cpp
View File

@@ -397,14 +397,6 @@ const CMenuOptionChooser::keyval_ext OSD_PRESET_OPTIONS[] =
{ COsdSetup::PRESET_LCD, NONEXISTANT_LOCALE, "LCD" }
};
const CMenuOptionChooser::keyval OSD_RESOLUTION_FORCE_OPTIONS[]=
{
{ COsdHelpers::FORCE_NEVER, LOCALE_COLORMENU_OSD_RESOLUTION_FORCE_NEVER },
{ COsdHelpers::FORCE_HD, LOCALE_COLORMENU_OSD_RESOLUTION_FORCE_HD },
{ COsdHelpers::FORCE_ALL, LOCALE_COLORMENU_OSD_RESOLUTION_FORCE_ALL }
};
int OSD_RESOLUTION_FORCE_OPTIONS_COUNT = sizeof(OSD_RESOLUTION_FORCE_OPTIONS)/sizeof(OSD_RESOLUTION_FORCE_OPTIONS[0]);
#define INFOBAR_CASYSTEM_MODE_OPTION_COUNT 4
const CMenuOptionChooser::keyval INFOBAR_CASYSTEM_MODE_OPTIONS[INFOBAR_CASYSTEM_MODE_OPTION_COUNT] =
{
@@ -670,17 +662,11 @@ int COsdSetup::showOsdSetup()
}
int videoSystem = COsdHelpers::getInstance()->getVideoSystem();
bool enable = ((resCount > 1) &&
COsdHelpers::getInstance()->allow_OSDMODE_1080(videoSystem) &&
COsdHelpers::getInstance()->isVideoSystem1080(videoSystem) &&
(g_settings.video_Mode != VIDEO_STD_AUTO));
CMenuOptionChooser * osd_res = new CMenuOptionChooser(LOCALE_COLORMENU_OSD_RESOLUTION, &g_settings.osd_resolution, kext, resCount, enable, this);
osd_res->setHint("", LOCALE_MENU_HINT_OSD_RESOLUTION);
osd_menu->addItem(osd_res);
// force resolution in auto-mode
enable = (g_settings.video_Mode == VIDEO_STD_AUTO);
CMenuOptionChooser * osd_res_force = new CMenuOptionChooser(LOCALE_COLORMENU_OSD_RESOLUTION_FORCE, &g_settings.osd_resolution_force, OSD_RESOLUTION_FORCE_OPTIONS, OSD_RESOLUTION_FORCE_OPTIONS_COUNT, enable, this);
osd_res_force->setHint("", LOCALE_MENU_HINT_OSD_RESOLUTION_FORCE);
osd_menu->addItem(osd_res_force);
#endif
//monitor