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

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fc24e990b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- allow to force given osd resolution in "videosystem = auto" mode

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-06 13:20:02 +01:00
committed by Michael Liebmann
parent 78a2c71634
commit f3fe4a116f
9 changed files with 64 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gui/osd_helpers.cpp
View File

@@ -61,12 +61,9 @@ void COsdHelpers::changeOsdResolution(uint32_t mode, bool automode/*=false*/, bo
if ((g_settings.video_Mode == VIDEO_STD_AUTO) &&
(g_settings.enabled_auto_modes[videoSystem] == 1) &&
(!isVideoSystem1080(videoSystem)))
(!allow_OSDMODE_1080(videoSystem)))
modeNew = OSDMODE_720;
// if (!isVideoSystem1080(videoSystem))
// modeNew = OSDMODE_720;
idx = frameBuffer->getIndexOsdResolution(modeNew);
resetOsd = (modeNew != getOsdResolution()) ? true : false;
#if 1
@@ -130,28 +127,28 @@ void COsdHelpers::changeOsdResolution(uint32_t, bool, bool)
}
#endif
int COsdHelpers::isVideoSystem1080(int res)
bool COsdHelpers::allow_OSDMODE_1080(int res)
{
if ((res == VIDEO_STD_1080I60) ||
(res == VIDEO_STD_1080I50) ||
(res == VIDEO_STD_1080P30) ||
(res == VIDEO_STD_1080P24) ||
(res == VIDEO_STD_1080P25))
return true;
if (g_settings.osd_resolution_force == FORCE_ALL || (
(res == VIDEO_STD_1080I50)
|| (res == VIDEO_STD_1080I60)
|| (res == VIDEO_STD_1080P24)
|| (res == VIDEO_STD_1080P25)
|| (res == VIDEO_STD_1080P30)
#ifdef BOXMODEL_CS_HD2
if ((res == VIDEO_STD_1080P50) ||
(res == VIDEO_STD_1080P60) ||
(res == VIDEO_STD_1080P2397) ||
(res == VIDEO_STD_1080P2997))
return true;
|| (res == VIDEO_STD_1080P50)
|| (res == VIDEO_STD_1080P60)
|| (res == VIDEO_STD_1080P2397)
|| (res == VIDEO_STD_1080P2997)
#endif
))
return true;
#if 0
/* for testing only */
if (res == VIDEO_STD_720P50)
if (g_settings.osd_resolution_force == FORCE_HD && (
(res == VIDEO_STD_720P50)
|| (res == VIDEO_STD_720P60)
))
return true;
#endif
return false;
}