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

COsdHelpers: Remove no longer required function resetOsdResolution()

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


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-03-05 19:49:39 +01:00
parent 24176ae699
commit b548b66607
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; modeNew = OSDMODE_720;
idx = frameBuffer->getIndexOsdResolution(modeNew); idx = frameBuffer->getIndexOsdResolution(modeNew);
resetOsd = (modeNew != getOsdResolution()) ? true : false; 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) if (forceOsdReset)
resetOsd = true; 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 #else
void COsdHelpers::changeOsdResolution(uint32_t, bool, bool) void COsdHelpers::changeOsdResolution(uint32_t, bool, bool)
{ {
} }
void COsdHelpers::resetOsdResolution(int)
{
}
#endif #endif
int COsdHelpers::isVideoSystem1080(int res) int COsdHelpers::isVideoSystem1080(int res)
{ {
if ((res == VIDEO_STD_1080I60) || if ((res == VIDEO_STD_1080I60) ||

1
src/gui/osd_helpers.h
View File

@@ -19,7 +19,6 @@ class COsdHelpers
int g_settings_osd_resolution_save; int g_settings_osd_resolution_save;
void changeOsdResolution(uint32_t mode, bool automode=false, bool forceOsdReset=false); void changeOsdResolution(uint32_t mode, bool automode=false, bool forceOsdReset=false);
void resetOsdResolution(int newSystem);
int isVideoSystem1080(int res); int isVideoSystem1080(int res);
int getVideoSystem(); int getVideoSystem();
uint32_t getOsdResolution(); uint32_t getOsdResolution();

9
src/gui/videosettings.cpp
View File

@@ -413,9 +413,8 @@ void CVideoSettings::setVideoSettings()
void CVideoSettings::setupVideoSystem(bool do_ask) void CVideoSettings::setupVideoSystem(bool do_ask)
{ {
printf("[neutrino VideoSettings] %s setup videosystem...\n", __FUNCTION__); printf("[neutrino VideoSettings] %s setup videosystem...\n", __FUNCTION__);
COsdHelpers::getInstance()->resetOsdResolution(g_settings.video_Mode);
COsdHelpers::getInstance()->setVideoSystem(g_settings.video_Mode); //FIXME COsdHelpers::getInstance()->setVideoSystem(g_settings.video_Mode); //FIXME
COsdHelpers::getInstance()->changeOsdResolution(0, true, true); COsdHelpers::getInstance()->changeOsdResolution(0, true, false);
if (do_ask) if (do_ask)
{ {
@@ -425,9 +424,8 @@ void CVideoSettings::setupVideoSystem(bool do_ask)
if (ShowMsg(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_VIDEO_MODE_OK), CMsgBox::mbrNo, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_INFO) != CMsgBox::mbrYes) if (ShowMsg(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_VIDEO_MODE_OK), CMsgBox::mbrNo, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_INFO) != CMsgBox::mbrYes)
{ {
g_settings.video_Mode = prev_video_mode; g_settings.video_Mode = prev_video_mode;
COsdHelpers::getInstance()->resetOsdResolution(g_settings.video_Mode);
COsdHelpers::getInstance()->setVideoSystem(g_settings.video_Mode); COsdHelpers::getInstance()->setVideoSystem(g_settings.video_Mode);
COsdHelpers::getInstance()->changeOsdResolution(0, true, true); COsdHelpers::getInstance()->changeOsdResolution(0, true, false);
} }
else else
prev_video_mode = g_settings.video_Mode; prev_video_mode = g_settings.video_Mode;
@@ -611,9 +609,8 @@ void CVideoSettings::nextMode(void)
else if(res == messages_return::cancel_info) { else if(res == messages_return::cancel_info) {
g_settings.video_Mode = VIDEOMENU_VIDEOMODE_OPTIONS[curmode].key; g_settings.video_Mode = VIDEOMENU_VIDEOMODE_OPTIONS[curmode].key;
//CVFD::getInstance()->ShowText(text); //CVFD::getInstance()->ShowText(text);
COsdHelpers::getInstance()->resetOsdResolution(g_settings.video_Mode);
COsdHelpers::getInstance()->setVideoSystem(g_settings.video_Mode); COsdHelpers::getInstance()->setVideoSystem(g_settings.video_Mode);
COsdHelpers::getInstance()->changeOsdResolution(0, true, true); COsdHelpers::getInstance()->changeOsdResolution(0, true, false);
//return; //return;
disp_cur = 1; disp_cur = 1;
} }

4
src/neutrino.cpp
View File

@@ -2994,14 +2994,12 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
return messages_return::handled; return messages_return::handled;
if (!frameBufferInitialized) { if (!frameBufferInitialized) {
coh->resetOsdResolution(videoSystem);
coh->setVideoSystem(videoSystem, false); coh->setVideoSystem(videoSystem, false);
return messages_return::handled; return messages_return::handled;
} }
coh->resetOsdResolution(videoSystem);
coh->setVideoSystem(videoSystem, false); coh->setVideoSystem(videoSystem, false);
coh->changeOsdResolution(0, true, true); coh->changeOsdResolution(0, true, false);
return messages_return::handled; return messages_return::handled;
} }
if(msg == NeutrinoMessages::EVT_ZAP_COMPLETE) { if(msg == NeutrinoMessages::EVT_ZAP_COMPLETE) {