Explicit fec for upcoming drivers; Little fixes

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@537 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-04-04 17:23:59 +00:00
parent 461432a941
commit 03b56ffd1c
9 changed files with 158 additions and 131 deletions

View File

@@ -812,32 +812,37 @@ const CMenuOptionChooser::keyval SATSETUP_DISEQC_OPTIONS[SATSETUP_DISEQC_OPTION_
{ SMATV_REMOTE_TUNING, LOCALE_SATSETUP_SMATVREMOTE }
};
#define SATSETUP_SCANTP_FEC_COUNT 23
#define SATSETUP_SCANTP_FEC_COUNT 21
#define CABLESETUP_SCANTP_FEC_COUNT 5
const CMenuOptionChooser::keyval SATSETUP_SCANTP_FEC[SATSETUP_SCANTP_FEC_COUNT] =
{
{ FEC_AUTO, LOCALE_SCANTP_FEC_AUTO },
{ FEC_S2_AUTO, LOCALE_SCANTP_FEC_AUTO_S2 },
{ FEC_1_2, LOCALE_SCANTP_FEC_1_2 },
{ FEC_2_3, LOCALE_SCANTP_FEC_2_3 },
{ FEC_3_4, LOCALE_SCANTP_FEC_3_4 },
{ FEC_5_6, LOCALE_SCANTP_FEC_5_6 },
{ FEC_7_8, LOCALE_SCANTP_FEC_7_8 },
{ FEC_S2_QPSK_1_2, LOCALE_FEC_S2_QPSK_1_2 },
{ FEC_S2_QPSK_2_3, LOCALE_FEC_S2_QPSK_2_3 },
{ FEC_S2_QPSK_3_4, LOCALE_FEC_S2_QPSK_3_4 },
{ FEC_S2_QPSK_5_6, LOCALE_FEC_S2_QPSK_5_6 },
{ FEC_S2_QPSK_7_8, LOCALE_FEC_S2_QPSK_7_8 },
//{ FEC_S2_QPSK_7_8, LOCALE_FEC_S2_QPSK_7_8 },
{ FEC_S2_QPSK_8_9, LOCALE_FEC_S2_QPSK_8_9 },
{ FEC_S2_QPSK_3_5, LOCALE_FEC_S2_QPSK_3_5 },
{ FEC_S2_QPSK_4_5, LOCALE_FEC_S2_QPSK_4_5 },
{ FEC_S2_QPSK_9_10, LOCALE_FEC_S2_QPSK_9_10 },
{ FEC_S2_8PSK_1_2, LOCALE_FEC_S2_8PSK_1_2 },
//{ FEC_S2_8PSK_1_2, LOCALE_FEC_S2_8PSK_1_2 },
{ FEC_S2_8PSK_2_3, LOCALE_FEC_S2_8PSK_2_3 },
{ FEC_S2_8PSK_3_4, LOCALE_FEC_S2_8PSK_3_4 },
{ FEC_S2_8PSK_5_6, LOCALE_FEC_S2_8PSK_5_6 },
{ FEC_S2_8PSK_7_8, LOCALE_FEC_S2_8PSK_7_8 },
{ FEC_S2_8PSK_8_9, LOCALE_FEC_S2_8PSK_8_9 },
{ FEC_S2_8PSK_3_5, LOCALE_FEC_S2_8PSK_3_5 },
{ FEC_S2_8PSK_4_5, LOCALE_FEC_S2_8PSK_4_5 },
{ FEC_S2_8PSK_5_6, LOCALE_FEC_S2_8PSK_5_6 },
//{ FEC_S2_8PSK_7_8, LOCALE_FEC_S2_8PSK_7_8 },
{ FEC_S2_8PSK_8_9, LOCALE_FEC_S2_8PSK_8_9 },
//{ FEC_S2_8PSK_4_5, LOCALE_FEC_S2_8PSK_4_5 },
{ FEC_S2_8PSK_9_10, LOCALE_FEC_S2_8PSK_9_10 }
};