mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- revert frontend/scan changes

Browse Source 
This reverts commits

01: 7c109f36dd4297499f98c25720b7622eb5d15d41
02: be39dcf90561d819be19d4a53e285733b86f2a2a
03: 2f6346c63620a88152a5936e424f50236257df55
04: 95a6a7b45f7e6e4b5addf36c72ef572c220f6509
05: ffe8a28150607dcefd2f94e8eb94fcd07cf94998
06: 7b6a945d76fa50f59fb8d2c3d37fa707ff1028fa
07: 927f09bb2de79bb318934963fcdb65c31fe17b8b
08: b9522992e9d4b7d2b0cb2b2d32a56c01b1c5df97
09: fd8a6c469b88516fa18c3b10dc87e05a687425c5
10: b530a78ffb5593d4287a5f15adad8bf239363b93
11: 25b9c4b40e17d28202d19896e4fd04efbcdaa9d5

 Conflicts:
	src/zapit/src/frontend.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>

Adopted parts because of conflicts:

01: untouched/not picked                     - frontend_types.h: fix unused-variable
02: 3c5ea6452c frontend_types.h: fix missing name of enum typedef
03: 03b5192fe3 fix transponders
04: untouched/not picked                     fix typo
05: 61579e130a adopt scansettings to new frontend handling
06: cde88688ca fix multistream (thx BP for testing)
07: b019079220 DVB-T2 fix
08: b9522992e9d4b7d2b0cb2b2d32a56c01b1c5df97 cosmetics
09: 414043913e fix frontend-parameters
10: untouched/not picked                     Revert "Revert "frontend multistream fixes""
11: untouched/not picked                     Revert "Revert "complete rebuild of frontend cmds""
This commit is contained in:
svenhoefer
2020-11-23 22:59:16 +01:00
committed by Thilo Graf
parent 9ebc8c5cc6
commit 388c819813
10 changed files with 290 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/scan.cpp
View File

@@ -235,15 +235,9 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
TP.feparams.delsys = (delivery_system_t)scansettings.sat_TP_delsys;
TP.feparams.modulation = (fe_modulation_t) scansettings.sat_TP_mod;
TP.feparams.pilot = (zapit_pilot_t) scansettings.sat_TP_pilot;
TP.feparams.plp_id = (unsigned int)atoi(scansettings.sat_TP_pli.c_str());
if (TP.feparams.plp_id == 0)
TP.feparams.plp_id = NO_STREAM_ID_FILTER;
TP.feparams.pls_code = (uint32_t)atoi(scansettings.sat_TP_plc.c_str());
if (TP.feparams.pls_code == 0)
TP.feparams.pls_code = PLS_Default_Gold_Code;
TP.feparams.plp_id = atoi(scansettings.sat_TP_pli.c_str());
TP.feparams.pls_code = atoi(scansettings.sat_TP_plc.c_str());
TP.feparams.pls_mode = (fe_pls_mode_t) scansettings.sat_TP_plm;
if (TP.feparams.pls_mode == 0)
TP.feparams.pls_mode = PLS_Gold;
} else if (CFrontend::isTerr(delsys)) {
/* DVB-T. TODO: proper menu and parameter setup, not all "AUTO" */
TP.feparams.frequency = atoi(scansettings.terrestrial_TP_freq.c_str());
@@ -259,9 +253,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
TP.feparams.guard_interval = (fe_guard_interval_t)scansettings.terrestrial_TP_guard;
TP.feparams.hierarchy = (fe_hierarchy_t)scansettings.terrestrial_TP_hierarchy;
TP.feparams.delsys = (delivery_system_t)scansettings.terrestrial_TP_delsys;
TP.feparams.plp_id = (unsigned int)atoi(scansettings.terrestrial_TP_pli.c_str());
if (TP.feparams.plp_id == 0)
TP.feparams.plp_id = NO_STREAM_ID_FILTER;
TP.feparams.plp_id = atoi(scansettings.terrestrial_TP_pli.c_str());
} else if (CFrontend::isCable(delsys)) {
TP.feparams.frequency = atoi(scansettings.cable_TP_freq.c_str());
TP.feparams.symbol_rate = atoi(scansettings.cable_TP_rate.c_str());
@@ -450,10 +442,7 @@ neutrino_msg_t CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data)
if (CFrontend::isSat(feparams->delsys))
{
CFrontend::getDelSys(feparams->delsys, feparams->fec_inner, feparams->modulation, f, s, m);
if (feparams->plp_id == NO_STREAM_ID_FILTER)
snprintf(buffer,sizeof(buffer), "%u %c %d %s %s %s ", freq, transponder::pol(feparams->polarization), feparams->symbol_rate/1000, f, s, m);
else
snprintf(buffer,sizeof(buffer), "%u %c %d %s %s %s (%u/%s/%s) ", freq, transponder::pol(feparams->polarization), feparams->symbol_rate/1000, f, s, m, feparams->plp_id, transponder::getPLSCode(feparams->pls_code).c_str(), transponder::getPLSMode(feparams->pls_mode).c_str());
snprintf(buffer,sizeof(buffer), "%u %c %d %s %s %s (%d/%d/%s) ", freq, transponder::pol(feparams->polarization), feparams->symbol_rate/1000, f, s, m, feparams->plp_id, feparams->pls_code, transponder::getPLSMode(feparams->pls_mode).c_str());
}
else if (CFrontend::isCable(feparams->delsys))
{
@@ -464,10 +453,7 @@ neutrino_msg_t CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data)
{
CFrontend::getDelSys(feparams->delsys, feparams->code_rate_HP, feparams->modulation, f, s, m);
CFrontend::getDelSys(feparams->delsys, feparams->code_rate_LP, feparams->modulation, f2, s, m);
if (feparams->plp_id == NO_STREAM_ID_FILTER)
snprintf(buffer,sizeof(buffer), "%u %d %s %s %s ", freq, CFrontend::getFEBandwidth(feparams->bandwidth)/1000, f, f2, m);
else
snprintf(buffer,sizeof(buffer), "%u %d %s %s %s %u ", freq, CFrontend::getFEBandwidth(feparams->bandwidth)/1000, f, f2, m, feparams->plp_id);
snprintf(buffer,sizeof(buffer), "%u %d %s %s %s %d ", freq, CFrontend::getFEBandwidth(feparams->bandwidth)/1000, f, f2, m, feparams->plp_id);
}
paintLine(xpos2, ypos_frequency, w - (7*fw), buffer);
}