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

COsdHelpers: Remove no longer required function resetOsdResolution()

Browse Source
This commit is contained in:
M. Liebmann
2017-03-05 19:49:39 +01:00
parent fa08347ef4
commit b1dcce0ad3
4 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/osd_helpers.cpp
View File

@@ -62,7 +62,13 @@ void COsdHelpers::changeOsdResolution(uint32_t mode, bool automode/*=false*/, bo
modeNew = OSDMODE_720;
idx = frameBuffer->getIndexOsdResolution(modeNew);
resetOsd = (modeNew != getOsdResolution()) ? true : false;
#if 1
printf(">>>>>[%s:%d] osd mode: %s => %s, automode: %s, forceOsdReset: %s\n", __func__, __LINE__,
(g_settings.osd_resolution == OSDMODE_720)?"OSDMODE_720":"OSDMODE_1080",
(modeNew == OSDMODE_720)?"OSDMODE_720":"OSDMODE_1080",
(automode)?"true":"false",
(forceOsdReset)?"true":"false");
#endif
if (forceOsdReset)
resetOsd = true;
@@ -111,25 +117,12 @@ void COsdHelpers::changeOsdResolution(uint32_t mode, bool automode/*=false*/, bo
}
}
}
void COsdHelpers::resetOsdResolution(int newSystem)
{
int videoSystem = getVideoSystem();
if ((isVideoSystem1080(videoSystem)) && (!isVideoSystem1080(newSystem))) {
CFrameBuffer::getInstance()->setMode(1280, 720, 32);
}
}
#else
void COsdHelpers::changeOsdResolution(uint32_t, bool, bool)
{
}
void COsdHelpers::resetOsdResolution(int)
{
}
#endif
int COsdHelpers::isVideoSystem1080(int res)
{
if ((res == VIDEO_STD_1080I60) ||