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

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

Browse Source 
This reverts commit f3fe4a116f.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ce34d5cf9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-03-12 06:32:52 +01:00
parent b63ce09ff8
commit e7d1a44693
9 changed files with 25 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/gui/osd_helpers.cpp
View File

@@ -61,9 +61,12 @@ 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) &&
(!allow_OSDMODE_1080(videoSystem)))
(!isVideoSystem1080(videoSystem)))
modeNew = OSDMODE_720;
// if (!isVideoSystem1080(videoSystem))
// modeNew = OSDMODE_720;
idx = frameBuffer->getIndexOsdResolution(modeNew);
resetOsd = (modeNew != getOsdResolution()) ? true : false;
#if 1
@@ -127,28 +130,28 @@ void COsdHelpers::changeOsdResolution(uint32_t, bool, bool)
}
#endif
bool COsdHelpers::allow_OSDMODE_1080(int res)
int COsdHelpers::isVideoSystem1080(int res)
{
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
|| (res == VIDEO_STD_1080P50)
|| (res == VIDEO_STD_1080P60)
|| (res == VIDEO_STD_1080P2397)
|| (res == VIDEO_STD_1080P2997)
#endif
))
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_HD && (
(res == VIDEO_STD_720P50)
|| (res == VIDEO_STD_720P60)
))
#ifdef BOXMODEL_CS_HD2
if ((res == VIDEO_STD_1080P50) ||
(res == VIDEO_STD_1080P60) ||
(res == VIDEO_STD_1080P2397) ||
(res == VIDEO_STD_1080P2997))
return true;
#endif
#if 0
/* for testing only */
if (res == VIDEO_STD_720P50)
return true;
#endif
return false;
}