- pick mipsbox code from DDT, TangoCash and max10

Conflicts:
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2019-05-03 22:50:45 +02:00
committed by Thilo Graf
parent 15e8b2d5ea
commit 8991ed60f4
25 changed files with 148 additions and 56 deletions

View File

@@ -154,7 +154,7 @@ int CAudioSetup::showAudioSetup()
CMenuOptionChooser * as_oj_ddsubchn = new CMenuOptionChooser(LOCALE_AUDIOMENU_DOLBYDIGITAL, &g_settings.audio_DolbyDigital, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, audioSetupNotifier);
as_oj_ddsubchn->setHint("", LOCALE_MENU_HINT_AUDIO_DD);
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
CMenuOptionChooser * as_oj_ac3 = new CMenuOptionChooser(LOCALE_AUDIOMENU_AC3, &g_settings.ac3_pass, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, audioSetupNotifier);
as_oj_ac3->setHint("", LOCALE_MENU_HINT_AUDIO_AC3);
@@ -171,7 +171,7 @@ int CAudioSetup::showAudioSetup()
//dd via spdif
CMenuOptionChooser * as_oj_dd_spdif = new CMenuOptionChooser(LOCALE_AUDIOMENU_SPDIF_DD, &g_settings.spdif_dd, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, audioSetupNotifier);
as_oj_dd_spdif->setHint("", LOCALE_MENU_HINT_AUDIO_SPDIF_DD);
#endif // HAVE_ARM_HARDWARE
#endif // HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
CMenuOptionChooser * as_oj_avsync = NULL;
CMenuOptionNumberChooser * as_oj_vsteps = NULL;
@@ -235,14 +235,14 @@ int CAudioSetup::showAudioSetup()
audioSettings->addItem(as_oj_analogmode);
audioSettings->addItem(GenericMenuSeparatorLine);
//---------------------------------------------------------
#if HAVE_ARM_HARDWARE
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
audioSettings->addItem(as_oj_ac3);
audioSettings->addItem(as_oj_dts);
#else
if (g_info.hw_caps->has_HDMI)
audioSettings->addItem(as_oj_dd_hdmi);
audioSettings->addItem(as_oj_dd_spdif);
#endif // HAVE_ARM_HARDWARE
#endif // HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
audioSettings->addItem(as_oj_ddsubchn);
//---------------------------------------------------------
audioSettings->addItem(GenericMenuSeparatorLine);