mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 08:51:04 +02:00
videosettings: fix set and get video_43mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e65dca8c3
Author: GetAway <get-away@t-online.de>
Date: 2018-04-22 (Sun, 22 Apr 2018)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -580,7 +580,9 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /*
|
|||||||
//if(g_settings.video_Format != 1 && g_settings.video_Format != 3)
|
//if(g_settings.video_Format != 1 && g_settings.video_Format != 3)
|
||||||
if (g_settings.video_Format != 1 && g_settings.video_Format != 3 && g_settings.video_Format != 2)
|
if (g_settings.video_Format != 1 && g_settings.video_Format != 3 && g_settings.video_Format != 2)
|
||||||
g_settings.video_Format = 3;
|
g_settings.video_Format = 3;
|
||||||
videoDecoder->setAspectRatio(g_settings.video_Format, g_settings.video_43mode);
|
|
||||||
|
g_Zapit->setMode43(g_settings.video_43mode);
|
||||||
|
videoDecoder->setAspectRatio(g_settings.video_Format, -1);
|
||||||
#ifdef ENABLE_PIP
|
#ifdef ENABLE_PIP
|
||||||
pipDecoder->setAspectRatio(g_settings.video_Format, g_settings.video_43mode);
|
pipDecoder->setAspectRatio(g_settings.video_Format, g_settings.video_43mode);
|
||||||
#endif
|
#endif
|
||||||
@@ -643,7 +645,7 @@ void CVideoSettings::next43Mode(void)
|
|||||||
|
|
||||||
text = videomenu_43mode_options[curmode].value;
|
text = videomenu_43mode_options[curmode].value;
|
||||||
g_settings.video_43mode = videomenu_43mode_options[curmode].key;
|
g_settings.video_43mode = videomenu_43mode_options[curmode].key;
|
||||||
videoDecoder->setAspectRatio(-1, g_settings.video_43mode);
|
g_Zapit->setMode43(g_settings.video_43mode);
|
||||||
#ifdef ENABLE_PIP
|
#ifdef ENABLE_PIP
|
||||||
pipDecoder->setAspectRatio(-1, g_settings.video_43mode);
|
pipDecoder->setAspectRatio(-1, g_settings.video_43mode);
|
||||||
#endif
|
#endif
|
||||||
|
@@ -3372,6 +3372,9 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
|
|||||||
CVFD::getInstance()->UpdateIcons();
|
CVFD::getInstance()->UpdateIcons();
|
||||||
g_RCInput->killTimer(scrambled_timer);
|
g_RCInput->killTimer(scrambled_timer);
|
||||||
if (mode != NeutrinoModes::mode_webtv) {
|
if (mode != NeutrinoModes::mode_webtv) {
|
||||||
|
g_Zapit->setMode43(g_settings.video_43mode);
|
||||||
|
videoDecoder->setAspectRatio(g_settings.video_Format,-1);
|
||||||
|
|
||||||
scrambled_timer = g_RCInput->addTimer(10*1000*1000, true);
|
scrambled_timer = g_RCInput->addTimer(10*1000*1000, true);
|
||||||
SelectSubtitles();
|
SelectSubtitles();
|
||||||
//StartSubtitles(!g_InfoViewer->is_visible);
|
//StartSubtitles(!g_InfoViewer->is_visible);
|
||||||
|
Reference in New Issue
Block a user