From 2d85a76be7055d86f66b885abe76c0673d7c549e Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Thu, 27 Jun 2013 13:25:01 +0400 Subject: [PATCH] gui/videosettings.cpp: do not set g_settings.analog_mode2 on apollo Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/9f63e80629ab642cc46d07c8bde500824bf4431d Author: [CST] Focus Date: 2013-06-27 (Thu, 27 Jun 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/videosettings.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 27f46688f..b1927c04a 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -336,13 +336,16 @@ void CVideoSettings::setVideoSettings() videoDecoder->SetVideoMode((analog_mode_t) g_settings.analog_mode1); videoDecoder->SetVideoMode((analog_mode_t) g_settings.analog_mode2); #endif +#ifdef BOXMODEL_APOLLO + changeNotify(LOCALE_VIDEOMENU_ANALOG_MODE, NULL); +#else if (system_rev == 0x06) { changeNotify(LOCALE_VIDEOMENU_ANALOG_MODE, NULL); } else { changeNotify(LOCALE_VIDEOMENU_SCART, NULL); changeNotify(LOCALE_VIDEOMENU_CINCH, NULL); } - +#endif //setupVideoSystem(false/*don't ask*/);// focus: CVideoSettings constructor do this already ? #if 0