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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-28 16:55:39 +01:00
parent dff4ea2892 bf56f9f0bc
commit 5e5451332e
27 changed files with 348 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/osd_setup.cpp
View File

@@ -40,6 +40,7 @@
#include <neutrino_menue.h>
#include "osd_setup.h"
#include "osd_helpers.h"
#include "themes.h"
#include "screensetup.h"
#include "osdlang_setup.h"
@@ -684,7 +685,11 @@ int COsdSetup::showOsdSetup()
kext[0].valname = "-";
resCount = 1;
}
CMenuOptionChooser * osd_res = new CMenuOptionChooser(LOCALE_COLORMENU_OSD_RESOLUTION, &g_settings.osd_resolution, kext, resCount, (resCount>1), this);
int videoSystem = COsdHelpers::getInstance()->getVideoSystem();
bool enable = ((resCount > 1) &&
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);
#endif
@@ -1510,6 +1515,13 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
#ifdef ENABLE_CHANGE_OSD_RESOLUTION
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_COLORMENU_OSD_RESOLUTION))
{
if (frameBuffer->osd_resolutions.empty())
return true;
osd_menu->hide();
uint32_t osd_mode = (uint32_t)*(int*)data;
COsdHelpers::getInstance()->g_settings_osd_resolution_save = osd_mode;
COsdHelpers::getInstance()->changeOsdResolution(osd_mode);
#if 0
if (frameBuffer->fullHdAvailable()) {
if (frameBuffer->osd_resolutions.empty())
return true;
@@ -1539,6 +1551,7 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
g_InfoViewer->ResetModules();
}
}
#endif
return true;
}
#endif