From 2d47f3996bc66a74a3006f41af96278d8763fd08 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Mon, 20 Feb 2012 15:50:27 +0400 Subject: [PATCH 1/2] update .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index c341c7b38..b2acf5b02 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ INSTALL *.lo *.a *.la +.*.swp ### binaries that fall out of the build lib/sectionsdclient/sectionsdcontrol @@ -30,3 +31,5 @@ src/neutrino src/nhttpd/web/*.js.gz src/zapit/src/pzapit src/zapit/src/udpstreampes +src/drivertool +src/gui/svn_version.h From c489a4fcc4f35cdabecc7a4cd2453fd851486bee Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Mon, 20 Feb 2012 16:05:58 +0400 Subject: [PATCH 2/2] Dont use FEC menu entry on cable box --- src/gui/scan_setup.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index ad0ed9b8f..a6e4af2ea 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -830,17 +830,20 @@ int CScanSetup::addScanOptionsItems(CMenuWidget *options_menu, const int &shortc CStringInput *rate = new CStringInput(LOCALE_EXTRA_TP_RATE, (char *) scansettings.TP_rate, 8, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789"); CMenuForwarder *Rate = new CMenuForwarder(LOCALE_EXTRA_TP_RATE, true, scansettings.TP_rate, rate, "", CRCInput::convertDigitToKey(shortCut++)); - CMenuOptionChooser *fec = new CMenuOptionChooser(LOCALE_EXTRA_TP_FEC, (int *)&scansettings.TP_fec, SATSETUP_SCANTP_FEC, fec_count, true, NULL, CRCInput::convertDigitToKey(shortCut++), "", true); - + CMenuOptionChooser *fec = NULL; + CMenuOptionChooser *mod_pol= NULL; - if (r_system == DVB_S) + if (r_system == DVB_S) { + fec = new CMenuOptionChooser(LOCALE_EXTRA_TP_FEC, (int *)&scansettings.TP_fec, SATSETUP_SCANTP_FEC, fec_count, true, NULL, CRCInput::convertDigitToKey(shortCut++), "", true); mod_pol = new CMenuOptionChooser(LOCALE_EXTRA_TP_POL, (int *)&scansettings.TP_pol, SATSETUP_SCANTP_POL, SATSETUP_SCANTP_POL_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++)); - else if (r_system == DVB_C) + } else if (r_system == DVB_C) { mod_pol = new CMenuOptionChooser(LOCALE_EXTRA_TP_MOD, (int *)&scansettings.TP_mod, SATSETUP_SCANTP_MOD, SATSETUP_SCANTP_MOD_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++)); + } options_menu->addItem(Freq); options_menu->addItem(Rate); - options_menu->addItem(fec); + if (r_system == DVB_S) + options_menu->addItem(fec); options_menu->addItem(mod_pol); return shortCut;