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

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
This commit is contained in:
Jacek Jendrzej
2017-06-07 16:20:47 +02:00
parent 3ef61938c1 66f45a1be9
commit 4643ac3f51
80 changed files with 1972 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/videosettings.cpp
View File

@@ -46,6 +46,7 @@
#include <gui/widget/hintbox.h>
#include <gui/widget/msgbox.h>
#include <gui/osd_setup.h>
#include <gui/osd_helpers.h>
#include <driver/display.h>
#include <driver/screen_max.h>
@@ -517,7 +518,8 @@ void CVideoSettings::setVideoSettings()
void CVideoSettings::setupVideoSystem(bool do_ask)
{
printf("[neutrino VideoSettings] %s setup videosystem...\n", __FUNCTION__);
videoDecoder->SetVideoSystem(g_settings.video_Mode); //FIXME
COsdHelpers::getInstance()->setVideoSystem(g_settings.video_Mode); //FIXME
COsdHelpers::getInstance()->changeOsdResolution(0, true, false);
if (do_ask)
{
@@ -527,7 +529,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)
{
g_settings.video_Mode = prev_video_mode;
videoDecoder->SetVideoSystem(g_settings.video_Mode);
COsdHelpers::getInstance()->setVideoSystem(g_settings.video_Mode);
COsdHelpers::getInstance()->changeOsdResolution(0, true, false);
}
else
prev_video_mode = g_settings.video_Mode;
@@ -714,7 +717,8 @@ void CVideoSettings::nextMode(void)
else if(res == messages_return::cancel_info) {
g_settings.video_Mode = VIDEOMENU_VIDEOMODE_OPTIONS[curmode].key;
//CVFD::getInstance()->ShowText(text);
videoDecoder->SetVideoSystem(g_settings.video_Mode);
COsdHelpers::getInstance()->setVideoSystem(g_settings.video_Mode);
COsdHelpers::getInstance()->changeOsdResolution(0, true, false);
//return;
disp_cur = 1;
}