Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Commit: 053d97363c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)
This commit is contained in:
vanhofen
2017-03-29 21:02:27 +02:00
14 changed files with 260 additions and 32 deletions

View File

@@ -3239,7 +3239,8 @@ 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) {
if ((videoSystem != -1) /* -1 => not enabled for automode */ &&
(coh->getVideoSystem() != videoSystem)) {
coh->setVideoSystem(videoSystem, false);
if (frameBufferInitialized)
coh->changeOsdResolution(0, true, false);