Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-09-14 13:54:04 +02:00
61 changed files with 50439 additions and 713 deletions

View File

@@ -93,7 +93,7 @@ const CMenuOptionChooser::keyval AUDIOMENU_ANALOGOUT_OPTIONS[AUDIOMENU_ANALOGOUT
{ 1, LOCALE_AUDIOMENU_MONOLEFT },
{ 2, LOCALE_AUDIOMENU_MONORIGHT }
};
#if HAVE_COOL_HARDWARE
#ifdef BOXMODEL_CS_HD2
#define AUDIOMENU_SRS_OPTION_COUNT 3
#else
@@ -107,6 +107,7 @@ const CMenuOptionChooser::keyval AUDIOMENU_SRS_OPTIONS[AUDIOMENU_SRS_OPTION_COUN
{ 2 , LOCALE_AUDIO_SRS_ALGO_HEAVY }
#endif
};
#endif
#define AUDIOMENU_AVSYNC_OPTION_COUNT 3
const CMenuOptionChooser::keyval AUDIOMENU_AVSYNC_OPTIONS[AUDIOMENU_AVSYNC_OPTION_COUNT] =