Merge branch 'master' into pu/mp

Origin commit data
------------------
Commit: 1763bb9e64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-08 (Tue, 08 Aug 2017)
This commit is contained in:
Jacek Jendrzej
2017-08-08 20:06:40 +02:00
28 changed files with 298 additions and 141 deletions

View File

@@ -4254,7 +4254,7 @@ void CNeutrinoApp::radioMode( bool rezap)
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
videoDecoder->Standby(false);
}
mode = mode_radio;
#ifdef ENABLE_PIP
pipDecoder->Pig(g_settings.pip_radio_x, g_settings.pip_radio_y,
g_settings.pip_radio_width, g_settings.pip_radio_height,
@@ -4262,6 +4262,12 @@ void CNeutrinoApp::radioMode( bool rezap)
#endif
CRecordManager::getInstance()->StopAutoRecord();
if (mode != mode_webtv) {
frameBuffer->useBackground(false);
frameBuffer->paintBackground();
}
mode = mode_radio;
g_RemoteControl->radioMode();
SetChannelMode(g_settings.channel_mode_radio);