mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 23:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

revert frontend/scan changes

Browse Source 
This reverts commits

01: 650510526e
02: 6a04e51e4b
03: 40398dcc09
04: e53946641a
05: 969af25d98
06: 6e83dbd629
07: 850354ba63
08: 2d808d34bd
09: d97ed9d89e
10: 8003a13b98
11: 7ae8a37364


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d5d8b367f
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-11-23 (Mon, 23 Nov 2020)

Origin message was:
------------------
- revert frontend/scan changes

This reverts commits

01: 650510526e
02: 6a04e51e4b
03: 40398dcc09
04: e53946641a
05: 969af25d98
06: 6e83dbd629
07: 850354ba63
08: 2d808d34bd
09: d97ed9d89e
10: 8003a13b98
11: 7ae8a37364


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-11-23 22:59:16 +01:00
parent 2e12cfc8f3
commit d82e09d4a1
10 changed files with 284 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/scan_setup.cpp
View File

@@ -1826,7 +1826,7 @@ int CScanSetup::addScanOptionsItems(CMenuWidget *options_menu, const int &shortc
coderateLP->setHint("", LOCALE_MENU_HINT_SCAN_FEC);
tm = new CMenuOptionChooser(LOCALE_EXTRA_TP_TRANSMIT_MODE, (int *)&scansettings.terrestrial_TP_transmit_mode, TERRSETUP_SCANTP_TRANSMIT_MODE, TERRSETUP_SCANTP_TRANSMIT_MODE_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++));
tm->setHint("", LOCALE_MENU_HINT_SCAN_TRANSMIT_MODE);
CStringInput *pli = new CStringInput(LOCALE_EXTRA_TP_PLI, &scansettings.terrestrial_TP_pli, 3, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789");
CStringInput *pli = new CStringInput(LOCALE_EXTRA_TP_PLI, &scansettings.terrestrial_TP_pli, 1, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789");
Pli = new CMenuDForwarder(LOCALE_EXTRA_TP_PLI, true, scansettings.terrestrial_TP_pli, pli, "", CRCInput::convertDigitToKey(shortCut++));
}
@@ -2051,7 +2051,7 @@ void CScanSetup::updateManualSettings()
scansettings.sat_TP_delsys = tI->second.feparams.delsys;
scansettings.sat_TP_mod = tI->second.feparams.modulation;
scansettings.satName = CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition());
scansettings.sat_TP_pli = (tI->second.feparams.plp_id == NO_STREAM_ID_FILTER ? "0" : to_string(tI->second.feparams.plp_id));
scansettings.sat_TP_pli = to_string(tI->second.feparams.plp_id);
scansettings.sat_TP_plc = to_string(tI->second.feparams.pls_code);
scansettings.sat_TP_plm = tI->second.feparams.pls_mode;
} else if (CFrontend::isCable(tI->second.feparams.delsys)) {
@@ -2070,7 +2070,7 @@ void CScanSetup::updateManualSettings()
scansettings.terrestrial_TP_transmit_mode = tI->second.feparams.transmission_mode;
scansettings.terrestrial_TP_coderate_HP = tI->second.feparams.code_rate_HP;
scansettings.terrestrial_TP_coderate_LP = tI->second.feparams.code_rate_LP;
scansettings.terrestrial_TP_pli = (tI->second.feparams.plp_id == NO_STREAM_ID_FILTER ? "0" : to_string(tI->second.feparams.plp_id));
scansettings.terrestrial_TP_pli = to_string(tI->second.feparams.plp_id);
scansettings.terrestrialName = CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition());
}
@@ -2176,7 +2176,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
scansettings.sat_TP_delsys = tmpI->second.feparams.delsys;
scansettings.sat_TP_mod = tmpI->second.feparams.modulation;
scansettings.sat_TP_pilot = tmpI->second.feparams.pilot;
scansettings.sat_TP_pli = (tmpI->second.feparams.plp_id == NO_STREAM_ID_FILTER ? "0" : to_string(tmpI->second.feparams.plp_id));
scansettings.sat_TP_pli = to_string(tmpI->second.feparams.plp_id);
scansettings.sat_TP_plc = to_string(tmpI->second.feparams.pls_code);
scansettings.sat_TP_plm = tmpI->second.feparams.pls_mode;
}
@@ -2195,7 +2195,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
scansettings.terrestrial_TP_transmit_mode = tmpI->second.feparams.transmission_mode;
scansettings.terrestrial_TP_coderate_HP = tmpI->second.feparams.code_rate_HP;
scansettings.terrestrial_TP_coderate_LP = tmpI->second.feparams.code_rate_LP;
scansettings.terrestrial_TP_pli = (tmpI->second.feparams.plp_id == NO_STREAM_ID_FILTER ? "0" : to_string(tmpI->second.feparams.plp_id));
scansettings.terrestrial_TP_pli = to_string(tmpI->second.feparams.plp_id);
//scansettings.terrestrialName = CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition());
}
}