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

Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Commit: b435c29e1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)
This commit is contained in:
vanhofen
2017-03-26 23:24:10 +02:00
parent 28ea70c558 0541c8a8e7
commit 7e99dfa7d7
2 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/neutrino.cpp
View File

@@ -2248,7 +2248,7 @@ int CNeutrinoApp::run(int argc, char **argv)
TIMER_START();
cs_api_init();
cs_register_messenger(CSSendMessage);
#ifdef BOXMODEL_CS_HD2
#if defined(HAVE_COOL_HARDWARE) && defined(ENABLE_CHANGE_OSD_RESOLUTION)
cs_new_auto_videosystem();
#endif
@@ -3187,16 +3187,11 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
printf(">>>>>[CNeutrinoApp::%s:%d] Receive EVT_AUTO_SET_VIDEOSYSTEM message\n", __func__, __LINE__);
COsdHelpers *coh = COsdHelpers::getInstance();
int videoSystem = (int)data;
if (coh->getVideoSystem() == videoSystem)
return messages_return::handled;
if (!frameBufferInitialized) {
if (coh->getVideoSystem() != videoSystem) {
coh->setVideoSystem(videoSystem, false);
return messages_return::handled;
if (frameBufferInitialized)
coh->changeOsdResolution(0, true, false);
}
coh->setVideoSystem(videoSystem, false);
coh->changeOsdResolution(0, true, false);
return messages_return::handled;
}
if(msg == NeutrinoMessages::EVT_ZAP_COMPLETE) {