mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

-add: fta channels scan option (for Dr.Dish ;)

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@252 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-02-03 11:02:16 +00:00
parent e575a81c38
commit 0e92f5d4e9
11 changed files with 120 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/locale/deutsch.locale
View File

@@ -7,7 +7,8 @@ audio.srs_algo_normal normal
audio.srs_iq SRS TruVolume Technologie
audio.srs_nmgr Noise-Manager
audio.srs_volume Referenzlautstärke
audiomenu.analogout Analog-Ausgang
audiomenu.analog_mode Analog Modus
audiomenu.analog_out Analog-Ausgang
audiomenu.avs avs
audiomenu.avs_control Volume Steuerung avs/ost
audiomenu.avsync A/V sync
@@ -1138,6 +1139,7 @@ satsetup.savesettingsnow Einstellungen jetzt speichern
satsetup.smatvremote SMATV Remote Tuning
satsetup.uncomm_input Uncommitted
satsetup.usals_repeat USALS wiederholen
satsetup.use_fta_flag nur freie Kanäle
satsetup.use_nit Auswertung NIT
satsetup.use_usals Benutze USALS
scants.abort_body Scanvorgang wirklich abbrechen?

1
data/locale/english.locale
View File

@@ -1277,6 +1277,7 @@ satsetup.motor_pos Rotor position
satsetup.auto_scan Auto-Scan selected Satellite
satsetup.auto_scan_all Auto-Scan multiple Satellites
satsetup.manual_scan Manual frequency scan
satsetup.use_fta_flag just free Channels
satsetup.use_nit Use NIT
satsetup.diseqc_advanced Advanced
satsetup.diseqc_order Input order

5
src/gui/dboxinfo.cpp
View File

@@ -88,9 +88,6 @@ void CDBoxInfoWidget::hide()
{
frameBuffer->paintBackgroundBoxRel(x,y, width,height);
}
#define FP_IOCTL_GET_LNB_CURRENT 0x100
#define FP_IOCTL_GETID 0
#define FP_IOCTL_UPGRADE_CTRL 0x200
void CDBoxInfoWidget::paint()
{
@@ -320,7 +317,6 @@ void CDBoxInfoWidget::paint()
break;
case 1:
mpOffset = nameOffset + 10;
snprintf(ubuf,buf_size,"%7.2f%c", (s.f_blocks * (s.f_bsize / 1024.0)) / gb, c);
break;
case 2:
@@ -333,7 +329,6 @@ void CDBoxInfoWidget::paint()
break;
case 4:
mpOffset = nameOffset+ (sizeOffset+10)*3+10;
snprintf(ubuf,buf_size,"%4ld%c", blocks_percent_used,'%');
break;
}

3
src/gui/scan.cpp
View File

@@ -85,6 +85,7 @@ CScanTs::CScanTs()
}
extern int scan_pids;
extern int scan_fta_flag;//in zapit descriptors definiert
#define get_set CNeutrinoApp::getInstance()->getScanSettings()
int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
{
@@ -93,6 +94,8 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
neutrino_msg_data_t data;
//bool manual = (get_set.scan_mode == 2);
int scan_mode = get_set.scan_mode;
scan_fta_flag = get_set.scan_fta_flag;
sat_iterator_t sit;
bool scan_all = actionKey == "all";
bool test = actionKey == "test";

11
src/neutrino_menue.cpp
View File

@@ -1019,6 +1019,8 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings)
CMenuOptionChooser* useNit = new CMenuOptionChooser(LOCALE_SATSETUP_USE_NIT, (int *)&scanSettings.scan_mode, OPTIONS_OFF1_ON0_OPTIONS, OPTIONS_OFF1_ON0_OPTION_COUNT, true, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
CMenuOptionChooser* scanPids = new CMenuOptionChooser(LOCALE_EXTRA_ZAPIT_SCANPIDS, &scan_pids, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
CMenuOptionChooser* ftaFlag = new CMenuOptionChooser(LOCALE_SATSETUP_USE_FTA_FLAG, (int *)&scanSettings.scan_fta_flag, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF1_ON0_OPTION_COUNT, true, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
CMenuWidget* satSetup = new CMenuWidget(LOCALE_SATSETUP_SAT_SETUP, NEUTRINO_ICON_SETTINGS);
satSetup->addItem(GenericMenuSeparator);
satSetup->addItem(GenericMenuBack);
@@ -1164,16 +1166,18 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings)
manualScan->addItem(fec);
manualScan->addItem(mod_pol);
manualScan->addItem(useNit);
manualScan->addItem(ftaFlag);
manualScan->addItem(GenericMenuSeparatorLine);
manualScan->addItem(new CMenuForwarder(LOCALE_SCANTS_TEST, true, NULL, scanTs, "test", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
manualScan->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, scanTs, "manual", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
manualScan->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, scanTs, "manual", CRCInput::convertDigitToKey(0), digiIcon(0)));
CMenuWidget* autoScan = new CMenuWidget(LOCALE_SATSETUP_AUTO_SCAN, NEUTRINO_ICON_SETTINGS);
addMenueIntroItems(*autoScan);
autoScan->addItem(satSelect);
autoScan->addItem(useNit);
autoScan->addItem(scanPids);
autoScan->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, scanTs, "auto", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
autoScan->addItem(ftaFlag);
autoScan->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, scanTs, "auto", CRCInput::convertDigitToKey(0), digiIcon(0)));
CMenuOptionChooser* ojDiseqc = NULL;
CMenuOptionNumberChooser * ojDiseqcRepeats = NULL;
@@ -1201,7 +1205,8 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings)
autoScanAll->addItem(new CMenuForwarder(LOCALE_SATSETUP_SATELLITE, true, NULL, satOnOff, "", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
autoScanAll->addItem(useNit);
autoScanAll->addItem(scanPids);
autoScanAll->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, scanTs, "all", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
autoScanAll->addItem(ftaFlag);
autoScanAll->addItem(new CMenuForwarder(LOCALE_SCANTS_STARTNOW, true, NULL, scanTs, "all", CRCInput::convertDigitToKey(0), digiIcon(0)));
}
settings.addItem(GenericMenuSeparator);

1
src/system/locals.h
View File

@@ -933,6 +933,7 @@ typedef enum {
LOCALE_SATSETUP_AUTO_SCAN,
LOCALE_SATSETUP_AUTO_SCAN_ALL,
LOCALE_SATSETUP_MANUAL_SCAN,
LOCALE_SATSETUP_USE_FTA_FLAG,
LOCALE_SATSETUP_USE_NIT,
LOCALE_SATSETUP_USE_USALS,
LOCALE_SATSETUP_USALS_REPEAT,

1
src/system/locals_intern.h
View File

@@ -933,6 +933,7 @@ const char *locale_real_names[] = {
"satsetup.auto_scan",
"satsetup.auto_scan_all",
"satsetup.manual_scan",
"satsetup.use_fta_flag",
"satsetup.use_nit",
"satsetup.use_usals",
"satsetup.usals_repeat",

2
src/system/settings.cpp
View File

@@ -162,6 +162,7 @@ bool CScanSettings::loadSettings(const char * const fileName, const delivery_sys
scanType=(CZapitClient::scanType) configfile.getInt32("scanType", scanType);
strcpy(satNameNoDiseqc, configfile.getString("satNameNoDiseqc", satNameNoDiseqc).c_str());
scan_fta_flag = configfile.getInt32("scan_fta_flag", 0);
scan_mode = configfile.getInt32("scan_mode", 1); // NIT (0) or fast (1)
TP_fec = configfile.getInt32("TP_fec", 1);
TP_pol = configfile.getInt32("TP_pol", 0);
@@ -184,6 +185,7 @@ bool CScanSettings::saveSettings(const char * const fileName)
configfile.setInt32( "scanType", scanType );
configfile.setString( "satNameNoDiseqc", satNameNoDiseqc );
configfile.setInt32("scan_fta_flag", scan_fta_flag);
configfile.setInt32("scan_mode", scan_mode);
configfile.setInt32("TP_fec", TP_fec);
configfile.setInt32("TP_pol", TP_pol);

1
src/system/settings.h
View File

@@ -524,6 +524,7 @@ class CScanSettings
delivery_system_t delivery_system;
int scanSectionsd;
int scan_mode;
int scan_fta_flag;
int TP_fec;
int TP_pol;
int TP_mod;

6
src/zapit/src/descriptors.cpp
View File

@@ -56,7 +56,7 @@ extern CFrontend *frontend;
extern CEventServer *eventServer;
extern int scan_pids;
extern t_channel_id live_channel_id;
int scan_fta_flag = 0;
int add_to_scan(transponder_id_t TsidOnid, FrontendParameters *feparams, uint8_t polarity, bool fromnit = 0);
void generic_descriptor(const unsigned char * const)
@@ -400,6 +400,10 @@ void service_descriptor(const unsigned char * const buffer, const t_service_id s
CZapitChannel *channel = NULL;
bool tpchange = false;
static transponder_id_t last_tpid = 0;
//scrambled
if(free_ca && scan_fta_flag){
return;
}
service_type = fix_service_type(service_type);
uint8_t real_type = service_type;