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 'check/next-cc'

Browse Source 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
This commit is contained in:
Stefan Seyfried
2013-07-06 19:01:15 +02:00
parent 7ceb15984f e42b31e4a9
commit 6830b68cac
91 changed files with 5546 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/videosettings.cpp
View File

@@ -443,13 +443,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